diff --git a/pom.xml b/pom.xml index 6423abc6..7ca46a6d 100644 --- a/pom.xml +++ b/pom.xml @@ -192,11 +192,11 @@ hutool-all 5.7.12 - + 3.5.3.2 + com.xuxueli xxl-job-core @@ -247,11 +247,11 @@ ${ruoyi.version} - + com.ruoyi @@ -284,7 +284,6 @@ org.projectlombok lombok 1.18.18 - provided diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/LoginUser.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/LoginUser.java index 2f00e102..352db32d 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/LoginUser.java +++ b/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 roles; + public String getNickname() { + return nickname; + } + + public void setNickname(String nickname) { + this.nickname = nickname; + } + /** * 用户信息 */ diff --git a/ruoyi-common/ruoyi-common-core/pom.xml b/ruoyi-common/ruoyi-common-core/pom.xml index bcf477c1..3d753b30 100644 --- a/ruoyi-common/ruoyi-common-core/pom.xml +++ b/ruoyi-common/ruoyi-common-core/pom.xml @@ -116,11 +116,16 @@ javax.servlet javax.servlet-api - + + com.baomidou + mybatis-plus-boot-starter + + + io.swagger diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/BaseEntity.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/BaseEntity.java index 79aee389..ea829712 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/BaseEntity.java +++ b/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 params; public String getSearchValue() diff --git a/ruoyi-common/ruoyi-common-security/pom.xml b/ruoyi-common/ruoyi-common-security/pom.xml index 605d3884..6cfc8b5a 100644 --- a/ruoyi-common/ruoyi-common-security/pom.xml +++ b/ruoyi-common/ruoyi-common-security/pom.xml @@ -34,9 +34,13 @@ ruoyi-common-redis - + + + com.baomidou + mybatis-plus-boot-starter diff --git a/ruoyi-modules/ruoyi-gen/pom.xml b/ruoyi-modules/ruoyi-gen/pom.xml index a51984ba..e1ddc092 100644 --- a/ruoyi-modules/ruoyi-gen/pom.xml +++ b/ruoyi-modules/ruoyi-gen/pom.xml @@ -77,7 +77,15 @@ com.ruoyi ruoyi-common-swagger - + + org.projectlombok + lombok + + + diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTable.java b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTable.java index d08b7325..b7367b53 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTable.java +++ b/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 javax.validation.Valid; -import javax.validation.constraints.NotBlank; -import org.apache.commons.lang3.ArrayUtils; +import com.baomidou.mybatisplus.annotation.TableName; 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; diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTableColumn.java b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTableColumn.java index 2f3e99df..86daba21 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTableColumn.java +++ b/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; diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml index 9419ea4c..580617e7 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml @@ -6,4 +6,27 @@ server: spring: application: # 应用名称 - name: ruoyi-gen \ No newline at end of file + 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 \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml b/ruoyi-modules/ruoyi-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml index 83565467..ef0e1868 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml +++ b/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"> - + @@ -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 - where table_id = #{tableId} order by sort @@ -45,7 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by ordinal_position - + insert into gen_table_column ( table_id, column_name, @@ -89,7 +89,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ) - + update gen_table_column column_comment = #{columnComment}, diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/mapper/generator/GenTableMapper.xml b/ruoyi-modules/ruoyi-gen/src/main/resources/mapper/generator/GenTableMapper.xml index f93a32bb..69d197e0 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/resources/mapper/generator/GenTableMapper.xml +++ b/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"> - + @@ -28,7 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -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 - @@ -75,7 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - 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 - + insert into gen_table ( table_name, table_comment, @@ -168,7 +168,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ) - + update gen_table table_name = #{tableName}, diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/domain.java.vm b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/domain.java.vm index 3e6be024..6bfada9b 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/domain.java.vm +++ b/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(); - } + } diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/mapper.java.vm b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/mapper.java.vm index 6f031790..dd6405a0 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/mapper.java.vm +++ b/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} diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/service.java.vm b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/service.java.vm index 250f68c8..cdd8db61 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/service.java.vm +++ b/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} diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/serviceImpl.java.vm b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/serviceImpl.java.vm index 9cd8534b..6dce9288 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/serviceImpl.java.vm +++ b/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; diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/xml/mapper.xml.vm b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/xml/mapper.xml.vm index 5b704e73..0433e3cd 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/xml/mapper.xml.vm +++ b/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"> - + #foreach ($column in $columns) #end #if($table.sub) - + - + #foreach ($column in $subTable.columns) #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} - #foreach($column in $columns) @@ -72,7 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #end - + insert into ${tableName} #foreach($column in $columns) @@ -90,7 +90,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + update ${tableName} #foreach($column in $columns) diff --git a/ruoyi-modules/ruoyi-system/pom.xml b/ruoyi-modules/ruoyi-system/pom.xml index 4e07cb60..4e03e587 100644 --- a/ruoyi-modules/ruoyi-system/pom.xml +++ b/ruoyi-modules/ruoyi-system/pom.xml @@ -59,11 +59,16 @@ com.ruoyi ruoyi-common-datasource - + + com.baomidou + mybatis-plus-boot-starter + + + com.ruoyi @@ -109,6 +114,25 @@ ${project.artifactId} + org.springframework.boot spring-boot-maven-plugin diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CompetitionController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CompetitionController.java index 1e3e8ac1..03fb27aa 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CompetitionController.java +++ b/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.*; -import com.ruoyi.system.domain.vo.*; +import com.ruoyi.system.domain.Competition; +import com.ruoyi.system.domain.CompetitionSharePermissions; +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 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 * diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CompetitionMembersController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CompetitionMembersController.java index aab17222..d504f2fc 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CompetitionMembersController.java +++ b/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 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)); + } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CompetitionTeamVsTeamController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CompetitionTeamVsTeamController.java index a3011c78..ed2fa84c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CompetitionTeamVsTeamController.java +++ b/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 com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.system.domain.CompetitionTeamVsTeam; -import com.ruoyi.system.service.ICompetitionTeamVsTeamService; -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 javax.servlet.http.HttpServletResponse; +import java.security.InvalidParameterException; +import java.text.ParseException; +import java.util.*; +import java.util.stream.Collectors; /** * 赛会中-球队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); } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomerController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomerController.java index de6435f4..716acbe6 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomerController.java +++ b/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 list = customerService.selectCustomerMakerList(customer); + return getDataTable(list); + } + /** * 导出客户信息列表 */ diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomerOrderController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomerOrderController.java new file mode 100644 index 00000000..02185e71 --- /dev/null +++ b/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 list = customerOrderService.selectCustomerOrderList(customerOrder); + return getDataTable(list); + } + + @GetMapping("/getCustomerOrderPage") + public TableDataInfo getCustomerOrderPage(CustomerOrderVo customerOrder) + { + startPage(); + List 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 list = customerOrderService.selectCustomerOrderList(customerOrder); + ExcelUtil util = new ExcelUtil(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)); + } +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/WxUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/WxUserController.java index 7fbf9187..0d04abd5 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/WxUserController.java +++ b/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); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/BuildingInfoDetail.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/BuildingInfoDetail.java index cee7477b..4f2d4ff0 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/BuildingInfoDetail.java +++ b/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.fasterxml.jackson.annotation.JsonFormat; -import lombok.*; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; 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 */ diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/BuildingLabel.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/BuildingLabel.java index 0fca8703..87bc99f7 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/BuildingLabel.java +++ b/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.fasterxml.jackson.annotation.JsonFormat; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; 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(); - } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/BuildingTeamRel.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/BuildingTeamRel.java index 4086b569..787758ee 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/BuildingTeamRel.java +++ b/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.fasterxml.jackson.annotation.JsonFormat; -import com.mybatisflex.annotation.Table; -import lombok.Data; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; 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 */ diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CameraInfo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CameraInfo.java index c4b549d9..e05201f4 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CameraInfo.java +++ b/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.fasterxml.jackson.annotation.JsonFormat; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; 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(); - } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/Competition.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/Competition.java index f726601b..597b8860 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/Competition.java +++ b/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 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.*; -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; } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionMembers.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionMembers.java index 4454b33f..953a9a14 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionMembers.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionMembers.java @@ -1,13 +1,15 @@ package com.ruoyi.system.domain; -import java.math.BigDecimal; -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.math.BigDecimal; +import java.util.Date; /** * 比赛参与人员对象 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()") diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionMembersScore.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionMembersScore.java index 1331a7ee..5059668d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionMembersScore.java +++ b/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) */ diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionOfTeam.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionOfTeam.java index 9542fc5a..4a5c7754 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionOfTeam.java +++ b/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; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionResult.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionResult.java index 1a98e17d..4d3ff4b4 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionResult.java +++ b/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; } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionSharePermissions.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionSharePermissions.java index 21f2d364..78c5565d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionSharePermissions.java +++ b/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.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; 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) */ diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionTeamGroup.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionTeamGroup.java index 4efa994e..a852267d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionTeamGroup.java +++ b/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) */ diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionTeamVsTeam.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionTeamVsTeam.java index 8333aa88..c9ccd2ef 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionTeamVsTeam.java +++ b/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) */ diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CustomerOrder.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CustomerOrder.java new file mode 100644 index 00000000..f3d24c85 --- /dev/null +++ b/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; +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/FeatureLabel.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/FeatureLabel.java index b56b250a..0c0e5077 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/FeatureLabel.java +++ b/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.fasterxml.jackson.annotation.JsonFormat; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; 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(); - } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/FollowUp.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/FollowUp.java index efde3bc6..4ed1c947 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/FollowUp.java +++ b/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 followUpMethod; - /** 级别 */ - @Excel(name = "级别") - private String followLevel; + /** 跟进结果 */ @Excel(name = "跟进结果") private String followResult; - @Excel(name = "跟进方式") - private String followUpMethod; + + /** 意向级别 */ + @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; } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/GlobalAttachment.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/GlobalAttachment.java index cbef39ed..0bd1d2cb 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/GlobalAttachment.java +++ b/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.fasterxml.jackson.annotation.JsonFormat; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; 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(); - } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/GroupWechat.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/GroupWechat.java index a65a89ec..8edb06ca 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/GroupWechat.java +++ b/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.fasterxml.jackson.annotation.JsonFormat; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; 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(); - } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/Message.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/Message.java index 22f86ccf..7293c9fe 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/Message.java +++ b/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(); - } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/Sms.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/Sms.java index fccdfc63..14921280 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/Sms.java +++ b/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.Setter; +import lombok.Data; /** * * 此类的描述：短信的封装类型。 */ -@Getter -@Setter +@Data public class Sms { /** * 发送内容，如果含有空格，百分数等特殊内容，请用utf8方式进行编码，最多500个文字（1个英文或数字也算1个文字） diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/TeamMembers.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/TeamMembers.java index f55f97e3..e4e49c80 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/TeamMembers.java +++ b/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 */ diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/TrainingInfo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/TrainingInfo.java index ae96713c..fcaa8fda 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/TrainingInfo.java +++ b/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.fasterxml.jackson.annotation.JsonFormat; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; 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(); - } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/UserBuildingRel.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/UserBuildingRel.java index a8e23873..694cdd96 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/UserBuildingRel.java +++ b/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.fasterxml.jackson.annotation.JsonFormat; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; 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(); - } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/UserRole.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/UserRole.java index 37374302..69eb1805 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/UserRole.java +++ b/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.fasterxml.jackson.annotation.JsonFormat; -import lombok.*; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; 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 */ diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/UserWxAqrCode.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/UserWxAqrCode.java index ff10c7b9..72c9b176 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/UserWxAqrCode.java +++ b/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; - } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/WxBasketballTeam.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/WxBasketballTeam.java index dbd0fc6c..44dfa22a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/WxBasketballTeam.java +++ b/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(); - } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/WxBuildingInfo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/WxBuildingInfo.java index e49a8ee7..5e7826a1 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/WxBuildingInfo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/WxBuildingInfo.java @@ -1,12 +1,15 @@ package com.ruoyi.system.domain; -import java.math.BigDecimal; -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.math.BigDecimal; +import java.util.Date; /** * 球场管理对象 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(); - } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/WxUser.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/WxUser.java index efacb279..1b2a448f 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/WxUser.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/WxUser.java @@ -1,12 +1,15 @@ package com.ruoyi.system.domain; -import java.math.BigDecimal; -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.math.BigDecimal; +import java.util.Date; /** * 微信用户对象 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(); - } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/CompetitionMembersScoreVo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/CompetitionMembersScoreVo.java index 4fd20469..0fa58ea2 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/CompetitionMembersScoreVo.java +++ b/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; } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/CompetitionMembersVo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/CompetitionMembersVo.java index 371fffa8..9893cfef 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/CompetitionMembersVo.java +++ b/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 -@Getter +@Data 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) - private java.math.BigDecimal height; - - - @ApiModelProperty(value="体重",required=false) - private java.math.BigDecimal weight; - - /** - *球队位置【字典】 - */ - @ApiModelProperty(value="球队位置【字典】",required=false) - private String teamPosition; + @ApiModelProperty(value="个人生涯",required=false) + private CompetitionMembersScoreVo personalCareerVo; + @ApiModelProperty(value="赛会个人得分",required=false) + private CompetitionMembersScoreVo competitionMemberScore; } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/CompetitionTeamIntegralVo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/CompetitionTeamIntegralVo.java index 6f84289d..234e703d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/CompetitionTeamIntegralVo.java +++ b/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; } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/CustomerOrderVo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/CustomerOrderVo.java new file mode 100644 index 00000000..f46f68a9 --- /dev/null +++ b/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; +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/CustomerVo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/CustomerVo.java index f0b2f383..f64a23bf 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/CustomerVo.java +++ b/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; } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/PersonalCareerVo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/PersonalCareerVo.java index 10731b7d..9bb5cef8 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/PersonalCareerVo.java +++ b/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 -@Getter +@Data public class PersonalCareerVo { private static final long serialVersionUID = 1L; - + @ApiModelProperty(value="总场次",required=false) + private Long totalCount; /** *场均得分 */ diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/UserInfoResponse.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/UserInfoResponse.java index 1a2de0ac..649047dc 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/UserInfoResponse.java +++ b/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; } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BuildingInfoDetailMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BuildingInfoDetailMapper.java index 80545755..c2f21be3 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BuildingInfoDetailMapper.java +++ b/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 { /** * 查询【请填写功能名称】 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BuildingLabelMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BuildingLabelMapper.java index 6ed74cd4..a6308e1a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BuildingLabelMapper.java +++ b/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 { /** * 查询【请填写功能名称】 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BuildingTeamRelMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BuildingTeamRelMapper.java index 72fd41a3..bc3fc82f 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BuildingTeamRelMapper.java +++ b/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 { /** * 查询【请填写功能名称】 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CameraInfoMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CameraInfoMapper.java index ea508303..2541e5c9 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CameraInfoMapper.java +++ b/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 { /** * 查询【请填写功能名称】 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CompetitionMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CompetitionMapper.java index 9b925312..0e80f6a5 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CompetitionMapper.java +++ b/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 { /** * 查询比赛信息 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CompetitionMembersMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CompetitionMembersMapper.java index ce5b0f5e..5ca12da9 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CompetitionMembersMapper.java +++ b/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 { /** * 查询比赛参与人员 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CompetitionMembersScoreMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CompetitionMembersScoreMapper.java index 6f0922ca..62f38a91 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CompetitionMembersScoreMapper.java +++ b/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 { /** * 查询赛会中-赛程-人员得分 @@ -64,7 +65,9 @@ public interface CompetitionMembersScoreMapper public List findMembersScoreByCompetitionVsId(@Param("competitionId") Long competitionId, @Param("competitionVsId") Long competitionVsId); - PersonalCareerVo getUserScoreByUserId(@Param(value = "teamUserId") Long teamUserId); + CompetitionMembersScoreVo getUserScoreByUserId(@Param(value = "teamUserId") Long teamUserId); List getHonorList(@Param("competitionId") Long competitionId,@Param("userId") Long userId); + + CompetitionMembersScoreVo getThisCompetitionScore(@Param("competitionId") Long competitionId,@Param("competitionMembersId") Long competitionMembersId); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CompetitionOfTeamMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CompetitionOfTeamMapper.java index 260d50fe..17a95be5 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CompetitionOfTeamMapper.java +++ b/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 { /** * 查询赛会中-参赛队伍 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CompetitionResultMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CompetitionResultMapper.java index b22cfe2c..d5839647 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CompetitionResultMapper.java +++ b/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 { /** * 查询赛会中-赛程结果记录 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CompetitionSharePermissionsMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CompetitionSharePermissionsMapper.java index 08ed05b0..3cdfa1c3 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CompetitionSharePermissionsMapper.java +++ b/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 { /** * 查询赛会-权限分享 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CompetitionTeamGroupMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CompetitionTeamGroupMapper.java index ab5f7681..2b2f08a8 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CompetitionTeamGroupMapper.java +++ b/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 { /** * 查询赛会中-分组 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CompetitionTeamVsTeamMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CompetitionTeamVsTeamMapper.java index 54635a32..38728daf 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CompetitionTeamVsTeamMapper.java +++ b/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 { /** * 查询赛会中-球队VS球队关系 @@ -80,5 +80,5 @@ public interface CompetitionTeamVsTeamMapper int competitionVsTeamStatusUpdate(CompetitionTeamVsTeam competitionTeamVsTeam); - List getTodaySchedule(ICompetitionResultService competitionResultService); + List getTodaySchedule(CompetitionTeamVsTeam teamVsTeam); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CustomerMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CustomerMapper.java index 242417f2..a58a5b57 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CustomerMapper.java +++ b/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 selectCustomerMakerList(CustomerVo customer); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CustomerOrderMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CustomerOrderMapper.java new file mode 100644 index 00000000..c6d7f487 --- /dev/null +++ b/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 +{ + /** + * 查询客户-订车 + * + * @param id 客户-订车主键 + * @return 客户-订车 + */ + public CustomerOrder selectCustomerOrderById(Long id); + + /** + * 查询客户-订车列表 + * + * @param customerOrder 客户-订车 + * @return 客户-订车集合 + */ + public List 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 getCustomerOrderPage(CustomerOrderVo customerOrder); +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/FeatureLabelMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/FeatureLabelMapper.java index 124600d4..2d1df6a5 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/FeatureLabelMapper.java +++ b/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 { /** * 查询球馆特征 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/FollowUpMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/FollowUpMapper.java index b6c9400c..f22f8c12 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/FollowUpMapper.java +++ b/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.mybatisflex.core.BaseMapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.system.domain.FollowUp; +import java.util.List; + /** * 跟进模块-客户跟进记录Mapper接口 * diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/GlobalAttachmentMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/GlobalAttachmentMapper.java index 3d393545..841f64e4 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/GlobalAttachmentMapper.java +++ b/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 { /** * 查询【请填写功能名称】 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/GroupWechatMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/GroupWechatMapper.java index 076e2a76..059bc2df 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/GroupWechatMapper.java +++ b/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 { /** * 查询【请填写功能名称】 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/MessageMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/MessageMapper.java index 56be620a..d255f1af 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/MessageMapper.java +++ b/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 { /** * 查询【请填写功能名称】 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TeamMembersMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TeamMembersMapper.java index d35723c4..3d5b368f 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TeamMembersMapper.java +++ b/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 { /** * 查询球队人员 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TrainingInfoMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TrainingInfoMapper.java index 95099b8f..38abb026 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TrainingInfoMapper.java +++ b/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 { /** * 查询【请填写功能名称】 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserBuildingRelMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserBuildingRelMapper.java index ffc17b82..ebaf6232 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserBuildingRelMapper.java +++ b/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 { /** * 查询【请填写功能名称】 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserRoleMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserRoleMapper.java index 8de84940..2a7d3759 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserRoleMapper.java +++ b/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 { /** * 查询【请填写功能名称】 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserWxAqrCodeMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserWxAqrCodeMapper.java index fbe2c2e0..ed9864e5 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserWxAqrCodeMapper.java +++ b/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 { /** * 查询微信用户小程序二维码 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/WxBasketballTeamMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/WxBasketballTeamMapper.java index 60b30050..74c2aeda 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/WxBasketballTeamMapper.java +++ b/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 { /** * 查询球队管理 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/WxBuildingInfoMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/WxBuildingInfoMapper.java index 2da76a91..e80f6011 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/WxBuildingInfoMapper.java +++ b/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 { /** * 查询球场管理 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/WxUserMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/WxUserMapper.java index 47652437..b08ed87d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/WxUserMapper.java +++ b/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 { /** * 查询微信用户 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IBuildingInfoDetailService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IBuildingInfoDetailService.java index 506cd9c3..d744ad47 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IBuildingInfoDetailService.java +++ b/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 { /** * 查询【请填写功能名称】 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IBuildingLabelService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IBuildingLabelService.java index 074e5489..62e165d5 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IBuildingLabelService.java +++ b/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 { /** * 查询【请填写功能名称】 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IBuildingTeamRelService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IBuildingTeamRelService.java index 8070a8fb..c85c6cdc 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IBuildingTeamRelService.java +++ b/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 { /** * 查询【请填写功能名称】 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICameraInfoService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICameraInfoService.java index b4e20ed7..97fe41d9 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICameraInfoService.java +++ b/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 { /** * 查询【请填写功能名称】 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionMembersScoreService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionMembersScoreService.java index ca0f3fc7..d05843a8 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionMembersScoreService.java +++ b/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 { /** * 查询赛会中-赛程-人员得分 @@ -60,7 +62,9 @@ public interface ICompetitionMembersScoreService */ public int deleteCompetitionMembersScoreById(Long id); - PersonalCareerVo getUserScoreByUserId(Long userId); + CompetitionMembersScoreVo getUserScoreByUserId(Long userId); List getHonorList(Long competitionId, Long userId); + + CompetitionMembersScoreVo getThisCompetitionScore(Long competitionId, Long competitionMembersId); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionMembersService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionMembersService.java index 4a6e4845..abd07c9c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionMembersService.java +++ b/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 { /** * 查询比赛参与人员 @@ -52,6 +54,7 @@ public interface ICompetitionMembersService */ public int deleteCompetitionMembersByIds(Long[] ids); + public CompetitionMembersVo getCompetitionUserScoreInfo(CompetitionMembersVo vo); /** * 删除比赛参与人员信息 * diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionOfTeamService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionOfTeamService.java index 5c5fa3af..f5af9279 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionOfTeamService.java +++ b/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 { /** * 查询赛会中-参赛队伍 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionResultService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionResultService.java index 495dcaed..aeabb79b 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionResultService.java +++ b/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 { /** * 查询赛会中-赛程结果记录 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionService.java index af1b5dff..9dcfd6f6 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionService.java +++ b/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 java.util.Map; - +import com.baomidou.mybatisplus.extension.service.IService; 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 { /** * 查询比赛信息 @@ -87,6 +87,8 @@ public interface ICompetitionService Boolean edit(Competition entity); CompetitionExcleVo importExcleData(Long competitionId,Map maplist, Sheet sheet); + + CompetitionExcleVo importExcleDataUserAvatar(Long competitionId,Map maplist, Sheet sheet); //根据当前时间修改已经完成的赛会数据 int updateCompetitionFinish(); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionSharePermissionsService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionSharePermissionsService.java index 3594fcc1..16ed03c9 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionSharePermissionsService.java +++ b/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 { /** * 查询赛会-权限分享 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionTeamGroupService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionTeamGroupService.java index c8d9bf5c..f03415ac 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionTeamGroupService.java +++ b/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 { /** * 查询赛会中-分组 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionTeamVsTeamService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionTeamVsTeamService.java index befe4198..b1cf1d25 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionTeamVsTeamService.java +++ b/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 java.util.Map; - +import com.baomidou.mybatisplus.extension.service.IService; 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 { /** * 查询赛会中-球队VS球队关系 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICustomerOrderService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICustomerOrderService.java new file mode 100644 index 00000000..54fc2bb7 --- /dev/null +++ b/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 +{ + /** + * 查询客户-订车 + * + * @param id 客户-订车主键 + * @return 客户-订车 + */ + public CustomerOrder selectCustomerOrderById(Long id); + + /** + * 查询客户-订车列表 + * + * @param customerOrder 客户-订车 + * @return 客户-订车集合 + */ + public List 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 getCustomerOrderPage(CustomerOrderVo customerOrder); +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICustomerService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICustomerService.java index cd4eb899..555b38f4 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICustomerService.java +++ b/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 selectCustomerMakerList(CustomerVo customer); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IFeatureLabelService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IFeatureLabelService.java index a7ffef0e..65bd642d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IFeatureLabelService.java +++ b/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 { /** * 查询球馆特征 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IFollowUpService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IFollowUpService.java index a86d6ac7..abc739f2 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IFollowUpService.java +++ b/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; /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IGlobalAttachmentService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IGlobalAttachmentService.java index 16df3454..7c62ec61 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IGlobalAttachmentService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IGlobalAttachmentService.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.GlobalAttachment; +import java.util.List; + /** * 【请填写功能名称】Service接口 * * @author ruoyi * @date 2023-07-04 */ -public interface IGlobalAttachmentService +public interface IGlobalAttachmentService extends IService { /** * 查询【请填写功能名称】 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IGroupWechatService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IGroupWechatService.java index 645e8a8a..1fdd960e 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IGroupWechatService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IGroupWechatService.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.GroupWechat; +import java.util.List; + /** * 【请填写功能名称】Service接口 * * @author ruoyi * @date 2023-07-04 */ -public interface IGroupWechatService +public interface IGroupWechatService extends IService { /** * 查询【请填写功能名称】 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IMessageService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IMessageService.java index 0de66c99..5971cde7 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IMessageService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IMessageService.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.Message; +import java.util.List; + /** * 【请填写功能名称】Service接口 * * @author ruoyi * @date 2023-07-04 */ -public interface IMessageService +public interface IMessageService extends IService { /** * 查询【请填写功能名称】 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ITeamMembersService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ITeamMembersService.java index 61f5e8ac..30c0176d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ITeamMembersService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ITeamMembersService.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.TeamMembers; import com.ruoyi.system.domain.vo.TeamMembersResponse; import com.ruoyi.system.domain.vo.TeamMembersVo; +import java.util.List; + /** * 球队人员Service接口 * * @author ruoyi * @date 2022-11-03 */ -public interface ITeamMembersService +public interface ITeamMembersService extends IService { /** * 查询球队人员 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ITrainingInfoService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ITrainingInfoService.java index 13f40718..239d0645 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ITrainingInfoService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ITrainingInfoService.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.TrainingInfo; +import java.util.List; + /** * 【请填写功能名称】Service接口 * * @author ruoyi * @date 2023-07-04 */ -public interface ITrainingInfoService +public interface ITrainingInfoService extends IService { /** * 查询【请填写功能名称】 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IUserBuildingRelService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IUserBuildingRelService.java index c6349b7a..ce2e1a94 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IUserBuildingRelService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IUserBuildingRelService.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.UserBuildingRel; +import java.util.List; + /** * 【请填写功能名称】Service接口 * * @author ruoyi * @date 2023-07-04 */ -public interface IUserBuildingRelService +public interface IUserBuildingRelService extends IService { /** * 查询【请填写功能名称】 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IUserRoleService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IUserRoleService.java index df5274c6..c2d0063e 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IUserRoleService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IUserRoleService.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.UserRole; +import java.util.List; + /** * 【请填写功能名称】Service接口 * * @author ruoyi * @date 2023-07-04 */ -public interface IUserRoleService +public interface IUserRoleService extends IService { /** * 查询【请填写功能名称】 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IUserWxAqrCodeService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IUserWxAqrCodeService.java index b5dbc8cc..15e3c8ed 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IUserWxAqrCodeService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IUserWxAqrCodeService.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.UserWxAqrCode; import com.ruoyi.system.domain.vo.UserWxAqrCodeVo; +import java.util.List; + /** * 微信用户小程序二维码Service接口 * * @author ruoyi * @date 2022-10-18 */ -public interface IUserWxAqrCodeService +public interface IUserWxAqrCodeService extends IService { /** * 查询微信用户小程序二维码 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IWxBasketballTeamService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IWxBasketballTeamService.java index d332ea49..ac8975f0 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IWxBasketballTeamService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IWxBasketballTeamService.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.WxBasketballTeam; +import java.util.List; + /** * 球队管理Service接口 * * @author ruoyi * @date 2022-08-30 */ -public interface IWxBasketballTeamService +public interface IWxBasketballTeamService extends IService { /** * 查询球队管理 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IWxBuildingInfoService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IWxBuildingInfoService.java index 5909bf26..be62c4ae 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IWxBuildingInfoService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IWxBuildingInfoService.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.WxBuildingInfo; import com.ruoyi.system.domain.vo.BuildingInfoRequest; import com.ruoyi.system.domain.vo.BuildingInfoResponse; +import java.util.List; + /** * 球场管理Service接口 * * @author ruoyi * @date 2022-08-30 */ -public interface IWxBuildingInfoService +public interface IWxBuildingInfoService extends IService { /** * 查询球场管理 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IWxUserService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IWxUserService.java index 2cd1b823..81519d97 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IWxUserService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IWxUserService.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.WxUser; +import java.util.List; + /** * 微信用户Service接口 * * @author 吴一博 * @date 2022-08-30 */ -public interface IWxUserService +public interface IWxUserService extends IService { /** * 查询微信用户 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BuildingInfoDetailServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BuildingInfoDetailServiceImpl.java index b1e2e3e2..b19bdadf 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BuildingInfoDetailServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BuildingInfoDetailServiceImpl.java @@ -1,11 +1,13 @@ package com.ruoyi.system.service.impl; -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.ruoyi.system.mapper.BuildingInfoDetailMapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.system.domain.BuildingInfoDetail; +import com.ruoyi.system.mapper.BuildingInfoDetailMapper; import com.ruoyi.system.service.IBuildingInfoDetailService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; /** * 【请填写功能名称】Service业务层处理 @@ -14,7 +16,7 @@ import com.ruoyi.system.service.IBuildingInfoDetailService; * @date 2023-07-06 */ @Service -public class BuildingInfoDetailServiceImpl implements IBuildingInfoDetailService +public class BuildingInfoDetailServiceImpl extends ServiceImpl implements IBuildingInfoDetailService { @Autowired private BuildingInfoDetailMapper buildingInfoDetailMapper; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BuildingLabelServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BuildingLabelServiceImpl.java index 74597fb7..4b58a01c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BuildingLabelServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BuildingLabelServiceImpl.java @@ -1,11 +1,13 @@ package com.ruoyi.system.service.impl; -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.ruoyi.system.mapper.BuildingLabelMapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.system.domain.BuildingLabel; +import com.ruoyi.system.mapper.BuildingLabelMapper; import com.ruoyi.system.service.IBuildingLabelService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; /** * 【请填写功能名称】Service业务层处理 @@ -14,7 +16,7 @@ import com.ruoyi.system.service.IBuildingLabelService; * @date 2023-07-04 */ @Service -public class BuildingLabelServiceImpl implements IBuildingLabelService +public class BuildingLabelServiceImpl extends ServiceImpl implements IBuildingLabelService { @Autowired private BuildingLabelMapper buildingLabelMapper; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BuildingTeamRelServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BuildingTeamRelServiceImpl.java index da286f89..43395cb5 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BuildingTeamRelServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BuildingTeamRelServiceImpl.java @@ -1,11 +1,13 @@ package com.ruoyi.system.service.impl; -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.ruoyi.system.mapper.BuildingTeamRelMapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.system.domain.BuildingTeamRel; +import com.ruoyi.system.mapper.BuildingTeamRelMapper; import com.ruoyi.system.service.IBuildingTeamRelService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; /** * 【请填写功能名称】Service业务层处理 @@ -14,7 +16,7 @@ import com.ruoyi.system.service.IBuildingTeamRelService; * @date 2023-07-04 */ @Service -public class BuildingTeamRelServiceImpl implements IBuildingTeamRelService +public class BuildingTeamRelServiceImpl extends ServiceImpl implements IBuildingTeamRelService { @Autowired private BuildingTeamRelMapper buildingTeamRelMapper; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CameraInfoServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CameraInfoServiceImpl.java index 4492c199..98ff3aa0 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CameraInfoServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CameraInfoServiceImpl.java @@ -1,11 +1,13 @@ package com.ruoyi.system.service.impl; -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.ruoyi.system.mapper.CameraInfoMapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.system.domain.CameraInfo; +import com.ruoyi.system.mapper.CameraInfoMapper; import com.ruoyi.system.service.ICameraInfoService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; /** * 【请填写功能名称】Service业务层处理 @@ -14,7 +16,7 @@ import com.ruoyi.system.service.ICameraInfoService; * @date 2023-07-04 */ @Service -public class CameraInfoServiceImpl implements ICameraInfoService +public class CameraInfoServiceImpl extends ServiceImpl implements ICameraInfoService { @Autowired private CameraInfoMapper cameraInfoMapper; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionMembersScoreServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionMembersScoreServiceImpl.java index 3a8db869..5ac534e0 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionMembersScoreServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionMembersScoreServiceImpl.java @@ -1,13 +1,14 @@ package com.ruoyi.system.service.impl; -import java.util.List; - -import com.ruoyi.system.domain.vo.PersonalCareerVo; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.ruoyi.system.mapper.CompetitionMembersScoreMapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.system.domain.CompetitionMembersScore; +import com.ruoyi.system.domain.vo.CompetitionMembersScoreVo; +import com.ruoyi.system.mapper.CompetitionMembersScoreMapper; import com.ruoyi.system.service.ICompetitionMembersScoreService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; /** * 赛会中-赛程-人员得分Service业务层处理 @@ -16,7 +17,7 @@ import com.ruoyi.system.service.ICompetitionMembersScoreService; * @date 2022-11-03 */ @Service -public class CompetitionMembersScoreServiceImpl implements ICompetitionMembersScoreService +public class CompetitionMembersScoreServiceImpl extends ServiceImpl implements ICompetitionMembersScoreService { @Autowired private CompetitionMembersScoreMapper competitionMembersScoreMapper; @@ -94,7 +95,7 @@ public class CompetitionMembersScoreServiceImpl implements ICompetitionMembersSc } @Override - public PersonalCareerVo getUserScoreByUserId(Long userId) { + public CompetitionMembersScoreVo getUserScoreByUserId(Long userId) { return competitionMembersScoreMapper.getUserScoreByUserId(userId); } @@ -102,4 +103,9 @@ public class CompetitionMembersScoreServiceImpl implements ICompetitionMembersSc public List getHonorList(Long competitionId, Long userId) { return competitionMembersScoreMapper.getHonorList(competitionId,userId); } + + @Override + public CompetitionMembersScoreVo getThisCompetitionScore(Long competitionId, Long competitionMembersId) { + return competitionMembersScoreMapper.getThisCompetitionScore(competitionId,competitionMembersId); + } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionMembersServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionMembersServiceImpl.java index d1ffab2f..99ea19a7 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionMembersServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionMembersServiceImpl.java @@ -1,13 +1,22 @@ package com.ruoyi.system.service.impl; -import java.util.List; - +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.system.domain.Competition; +import com.ruoyi.system.domain.CompetitionMembers; +import com.ruoyi.system.domain.CompetitionOfTeam; +import com.ruoyi.system.domain.vo.CompetitionMembersScoreVo; import com.ruoyi.system.domain.vo.CompetitionMembersVo; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; +import com.ruoyi.system.mapper.CompetitionMapper; import com.ruoyi.system.mapper.CompetitionMembersMapper; -import com.ruoyi.system.domain.CompetitionMembers; +import com.ruoyi.system.mapper.CompetitionOfTeamMapper; +import com.ruoyi.system.service.ICompetitionMembersScoreService; import com.ruoyi.system.service.ICompetitionMembersService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; /** * 比赛参与人员Service业务层处理 @@ -16,10 +25,16 @@ import com.ruoyi.system.service.ICompetitionMembersService; * @date 2022-11-03 */ @Service -public class CompetitionMembersServiceImpl implements ICompetitionMembersService +public class CompetitionMembersServiceImpl extends ServiceImpl implements ICompetitionMembersService { @Autowired private CompetitionMembersMapper competitionMembersMapper; + @Autowired + private CompetitionOfTeamMapper competitionOfTeamMapper; + @Autowired + private ICompetitionMembersScoreService competitionMembersScoreService; + @Autowired + private CompetitionMapper competitionMapper; /** * 查询比赛参与人员 @@ -107,4 +122,25 @@ public class CompetitionMembersServiceImpl implements ICompetitionMembersService public void bindCompetitionMembersByTel(Long userId, String telephone) { competitionMembersMapper.bindCompetitionMembersByTel(userId,telephone); } + + @Override + public CompetitionMembersVo getCompetitionUserScoreInfo(CompetitionMembersVo vo) { + CompetitionMembersVo membersVo = new CompetitionMembersVo(); + CompetitionMembers member = competitionMembersMapper.selectCompetitionMembersById(vo.getId()); + BeanUtil.copyProperties(member,membersVo); + Competition competition = competitionMapper.selectCompetitionById(member.getCompetitionId()); + membersVo.setCompetitionName(competition.getCompetitionName()); + CompetitionOfTeam team = competitionOfTeamMapper.selectCompetitionOfTeamById(member.getCompetitionOfTeamId()); + membersVo.setTeamName(team.getTeamName()); + //获取本赛会的个人得分情况 + CompetitionMembersScoreVo membersScoreVo = competitionMembersScoreService.getThisCompetitionScore(member.getCompetitionId(),member.getId()); + membersVo.setCompetitionMemberScore(membersScoreVo); + //如果没有登录我们的系统的人员就无法统计职业生涯 + if(ObjectUtil.isNotEmpty(member.getUserId())){ + //个人生涯 + CompetitionMembersScoreVo personalCareerVo = competitionMembersScoreService.getUserScoreByUserId(member.getUserId()); + membersVo.setPersonalCareerVo(personalCareerVo); + } + return membersVo; + } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionOfTeamServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionOfTeamServiceImpl.java index bebad494..40f0f3ec 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionOfTeamServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionOfTeamServiceImpl.java @@ -1,17 +1,17 @@ package com.ruoyi.system.service.impl; -import java.util.Date; -import java.util.List; - +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.security.utils.SecurityUtils; import com.ruoyi.system.api.model.LoginUser; +import com.ruoyi.system.domain.CompetitionOfTeam; import com.ruoyi.system.domain.vo.CompetitionOfTeamVo; -import com.ruoyi.system.utils.LoginUserUtil; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import com.ruoyi.system.mapper.CompetitionOfTeamMapper; -import com.ruoyi.system.domain.CompetitionOfTeam; import com.ruoyi.system.service.ICompetitionOfTeamService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Date; +import java.util.List; /** * 赛会中-参赛队伍Service业务层处理 @@ -20,7 +20,7 @@ import com.ruoyi.system.service.ICompetitionOfTeamService; * @date 2022-11-03 */ @Service -public class CompetitionOfTeamServiceImpl implements ICompetitionOfTeamService +public class CompetitionOfTeamServiceImpl extends ServiceImpl implements ICompetitionOfTeamService { @Autowired private CompetitionOfTeamMapper competitionOfTeamMapper; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionResultServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionResultServiceImpl.java index 8316d24e..855e3360 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionResultServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionResultServiceImpl.java @@ -1,26 +1,22 @@ package com.ruoyi.system.service.impl; -import java.util.Date; -import java.util.List; - -import com.ruoyi.common.security.utils.SecurityUtils; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.system.api.model.LoginUser; -import com.ruoyi.system.api.model.WxLoginUser; +import com.ruoyi.system.domain.CompetitionResult; import com.ruoyi.system.domain.CompetitionTeamVsTeam; import com.ruoyi.system.domain.enums.VsResultEnums; import com.ruoyi.system.domain.vo.CompetitionResultVo; import com.ruoyi.system.domain.vo.CompetitionVsRecordVo; +import com.ruoyi.system.mapper.CompetitionResultMapper; import com.ruoyi.system.mapper.CompetitionTeamVsTeamMapper; -import com.ruoyi.system.utils.LoginUserUtil; +import com.ruoyi.system.service.ICompetitionResultService; import com.ruoyi.system.utils.UtilTool; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.system.mapper.CompetitionResultMapper; -import com.ruoyi.system.domain.CompetitionResult; -import com.ruoyi.system.service.ICompetitionResultService; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import java.util.Date; +import java.util.List; /** * 赛会中-赛程结果记录Service业务层处理 @@ -29,7 +25,7 @@ import javax.annotation.Resource; * @date 2022-11-03 */ @Service -public class CompetitionResultServiceImpl implements ICompetitionResultService +public class CompetitionResultServiceImpl extends ServiceImpl implements ICompetitionResultService { @Resource private CompetitionResultMapper competitionResultMapper; @@ -161,7 +157,7 @@ public class CompetitionResultServiceImpl implements ICompetitionResultService // entity.setCreatedBy(String.valueOf(user.getUserid())); entity.setCreatedTime(new Date()); competitionResultMapper.insertCompetitionResult(entity); - this.calculateScore(entity,user); + //this.calculateScore(entity,user); return true; } @@ -278,7 +274,7 @@ public class CompetitionResultServiceImpl implements ICompetitionResultService // entity.setModifiedBy(String.valueOf(user.getUserid())); entity.setLastUpdatedTime(new Date()); competitionResultMapper.updateCompetitionResult(entity); - this.calculateScore(entity,user); + //this.calculateScore(entity,user); return true; } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionServiceImpl.java index 8121a9fd..e6fd001d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionServiceImpl.java @@ -1,18 +1,11 @@ package com.ruoyi.system.service.impl; -import java.io.File; -import java.math.BigDecimal; -import java.text.DateFormat; -import java.text.SimpleDateFormat; -import java.util.*; -import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; - import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.crypto.digest.DigestUtil; import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.core.constant.CacheConstants; import com.ruoyi.common.core.constant.Constants; import com.ruoyi.common.core.exception.CheckedException; @@ -40,17 +33,23 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.util.StringUtils; import javax.annotation.Resource; +import java.io.File; +import java.math.BigDecimal; +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.*; +import java.util.concurrent.TimeUnit; +import java.util.stream.Collectors; /** * 比赛信息Service业务层处理 - * + * * @author ruoyi * @date 2022-11-02 */ @Log4j2 @Service -public class CompetitionServiceImpl implements ICompetitionService -{ +public class CompetitionServiceImpl extends ServiceImpl implements ICompetitionService { @Resource private CompetitionMapper competitionMapper; @Resource @@ -86,85 +85,80 @@ public class CompetitionServiceImpl implements ICompetitionService private String winLocation; @Value("${image.domainName}") private String domainName; + /** * 查询比赛信息 - * + * * @param id 比赛信息主键 * @return 比赛信息 */ @Override - public Competition selectCompetitionById(Long id) - { + public Competition selectCompetitionById(Long id) { return competitionMapper.selectCompetitionById(id); } /** * 查询比赛信息列表 - * + * * @param competition 比赛信息 * @return 比赛信息 */ @Override - public List selectCompetitionList(Competition competition) - { + public List selectCompetitionList(Competition competition) { return competitionMapper.selectCompetitionList(competition); } /** * 新增比赛信息 - * + * * @param competition 比赛信息 * @return 结果 */ @Override - public int insertCompetition(Competition competition) - { + public int insertCompetition(Competition competition) { return competitionMapper.insertCompetition(competition); } /** * 修改比赛信息 - * + * * @param competition 比赛信息 * @return 结果 */ @Override - public int updateCompetition(Competition competition) - { + public int updateCompetition(Competition competition) { return competitionMapper.updateCompetition(competition); } /** * 批量删除比赛信息 - * + * * @param ids 需要删除的比赛信息主键 * @return 结果 */ @Override - public int deleteCompetitionByIds(Long[] ids) - { + public int deleteCompetitionByIds(Long[] ids) { return competitionMapper.deleteCompetitionByIds(ids); } /** * 删除比赛信息信息 - * + * * @param id 比赛信息主键 * @return 结果 */ @Override - public int deleteCompetitionById(Long id) - { + public int deleteCompetitionById(Long id) { return competitionMapper.deleteCompetitionById(id); } @Override public WxAppletsCodeVo genCompetitionCommonAqrSpread(WxAppletsCodeVo wxAppletsCodeVo) { Object key = redisService.getCacheObject(CacheConstants.COMPETITION_SPREAD_AQR_CODE + wxAppletsCodeVo.getScene()); - if(ObjectUtils.isEmpty(key)){ + if (ObjectUtils.isEmpty(key)) { wxAppletsCodeVo = wxApplesCodeService.genWxApplesAqrCode(wxAppletsCodeVo); - redisService.setCacheObject(CacheConstants.COMPETITION_SPREAD_AQR_CODE + wxAppletsCodeVo.getScene(),wxAppletsCodeVo.getCodeImgUrl(),30L, TimeUnit.DAYS); - }else { + redisService.setCacheObject(CacheConstants.COMPETITION_SPREAD_AQR_CODE + wxAppletsCodeVo.getScene(), wxAppletsCodeVo.getCodeImgUrl(), 30L, TimeUnit.DAYS); + } else { wxAppletsCodeVo.setCodeImgUrl((String) key); } return wxAppletsCodeVo; @@ -172,22 +166,37 @@ public class CompetitionServiceImpl implements ICompetitionService @Override public List getCompetitionByCondition(CompetitionVo competition) { - return competitionMapper.getCompetitionByCondition(competition); + List competitionList = competitionMapper.getCompetitionByCondition(competition); + for (Competition comp : competitionList) { + if (comp.getCompetitionNature() == 0) { + WxBasketballTeam mainTeam = wxBasketballTeamMapper.selectWxBasketballTeamById(comp.getMainTeamId()); + if (ObjectUtil.isNotEmpty(mainTeam)) { + comp.setMainTeamLogo(mainTeam.getTeamLogo()); + } + if (comp.getGuestTeamId() != null) { + WxBasketballTeam guestTeam = wxBasketballTeamMapper.selectWxBasketballTeamById(comp.getGuestTeamId()); + if (ObjectUtil.isNotEmpty(guestTeam)) { + comp.setGuestTeamLogo(guestTeam.getTeamLogo()); + } + } + } + } + return competitionList; } @Override public CompetitionExcleVo getTeamEnrollExcleImpData(Long competitionId, Long userId) { CompetitionExcleVo excleVo = new CompetitionExcleVo(); Competition competition = competitionMapper.selectCompetitionById(competitionId); - if(ObjectUtil.isNull(competition)){ + if (ObjectUtil.isNull(competition)) { return excleVo; } //todo 获取球队数据 - CompetitionOfTeam team = competitionOfTeamMapper.selectOneByUserId(competitionId,String.valueOf(userId)); - if(ObjectUtil.isNull(team)){ + CompetitionOfTeam team = competitionOfTeamMapper.selectOneByUserId(competitionId, String.valueOf(userId)); + if (ObjectUtil.isNull(team)) { return excleVo; } - BeanUtil.copyProperties(competition,excleVo); + BeanUtil.copyProperties(competition, excleVo); excleVo.setOfTeam(team); //todo 查询球队队员数据 CompetitionMembers condtion = new CompetitionMembers(); @@ -201,15 +210,15 @@ public class CompetitionServiceImpl implements ICompetitionService @Override public CompetitionResponse getCompetitionById(Long id) { //查询比赛信息 - CompetitionResponse competitionResponse=new CompetitionResponse(); + CompetitionResponse competitionResponse = new CompetitionResponse(); Competition competition = competitionMapper.selectCompetitionById(id); - if(UtilTool.isNull(competition)){ + if (UtilTool.isNull(competition)) { throw new ServiceException("根据id未查询到约战信息"); } - BeanUtils.copyProperties(competition,competitionResponse); + BeanUtils.copyProperties(competition, competitionResponse); //查询比赛参与人员列表数据 List membersList = competitionMembersMapper.getCompetitionMembersByCompetitionId(competition.getId()); - if(competition.getCompetitionNature().intValue()==0) { + if (competition.getCompetitionNature().intValue() == 0) { Map> groupByTeamIdMap = membersList.stream().collect(Collectors.groupingBy(CompetitionMembers::getCompetitionTeamId)); //查询主队下的队员信息 for (Map.Entry> entry : groupByTeamIdMap.entrySet()) { if (!StringUtils.isEmpty(competition.getMainTeamId()) && entry.getKey().equals(competition.getMainTeamId())) { @@ -220,14 +229,14 @@ public class CompetitionServiceImpl implements ICompetitionService } } //查询球队的合照 - List teamIds =new ArrayList<>(); - if(!StringUtils.isEmpty(competition.getMainTeamId())) { + List teamIds = new ArrayList<>(); + if (!StringUtils.isEmpty(competition.getMainTeamId())) { teamIds.add(competition.getMainTeamId()); } - if(!StringUtils.isEmpty(competition.getGuestTeamId())) { + if (!StringUtils.isEmpty(competition.getGuestTeamId())) { teamIds.add(competition.getGuestTeamId()); } - if(teamIds.size()>0) { + if (teamIds.size() > 0) { List basketballTeamList = wxBasketballTeamMapper.selectBatchIds(teamIds); CompetitionTeamVsTeam competitionTeamVsTeam = new CompetitionTeamVsTeam(); for (WxBasketballTeam team : basketballTeamList) { @@ -255,26 +264,26 @@ public class CompetitionServiceImpl implements ICompetitionService public Boolean establishCompetition(CompetitionVo entity) { //使用赛会名称加密缓存防止重复提交 Object key = redisService.getCacheObject(Constants.COMPETITION_CREATE_KEY + DigestUtil.md5(entity.getCompetitionName().trim())); - if(ObjectUtil.isNotNull(key)){ + if (ObjectUtil.isNotNull(key)) { throw new ServiceException("当前创建赛会数据已提交到系统，毋须重复提交！"); } LoginUser user = SecurityUtils.getLoginUser(); entity.setCreatedBy(String.valueOf(user.getUserid())); entity.setCreatedTime(new Date()); DateFormat sdf = new SimpleDateFormat("yyyyMMdd"); - entity.setCompetitionCode(sdf.format(new Date())+ RandomStringUtils.randomNumeric(6)); + entity.setCompetitionCode(sdf.format(new Date()) + RandomStringUtils.randomNumeric(6)); //判断是否已经存在 - List existList = competitionMapper.selectCompetitionList( Competition.builder().competitionName(entity.getCompetitionName()).competitionNature(entity.getCompetitionNature()).build()); - if(existList.size()>0) { + List existList = competitionMapper.selectCompetitionList(Competition.builder().competitionName(entity.getCompetitionName()).competitionNature(entity.getCompetitionNature()).build()); + if (existList.size() > 0) { throw new ServiceException("当前赛会已存在，毋须重复提交！"); } //小程序-推送赛会通知给系统管理员。管理员好及时去审核赛会 List userRoles = userRoleMapper.selectUserRoleList(UserRole.builder().roleCode(UserRoles.ADMIN.code()).build()); List userIds = userRoles.stream().map(UserRole::getUserId).collect(Collectors.toList()); List managerUsers = wxUserMapper.listByIds(userIds); - if(!StringUtils.isEmpty(managerUsers)&&!StringUtils.isEmpty(managerUsers.size()>0)){ - for (WxUser managerUser:managerUsers){ - if(!StringUtils.isEmpty(managerUser.getOpenid())) { + if (!StringUtils.isEmpty(managerUsers) && !StringUtils.isEmpty(managerUsers.size() > 0)) { + for (WxUser managerUser : managerUsers) { + if (!StringUtils.isEmpty(managerUser.getOpenid())) { WxMssVo wxMssVo = new WxMssVo(); wxMssVo.setTemplate_id(WxAppletsTemplateIdsEnum.COMPETITION_SIGN_UP.getCode()); wxMssVo.setTouser(managerUser.getOpenid()); @@ -288,8 +297,8 @@ public class CompetitionServiceImpl implements ICompetitionService } } } - if(competitionMapper.insertCompetition(entity)>0){ - redisService.setCacheObject(Constants.COMPETITION_CREATE_KEY + DigestUtil.md5(entity.getCompetitionName().trim()),entity.getCompetitionName(),20L,TimeUnit.SECONDS); + if (competitionMapper.insertCompetition(entity) > 0) { + redisService.setCacheObject(Constants.COMPETITION_CREATE_KEY + DigestUtil.md5(entity.getCompetitionName().trim()), entity.getCompetitionName(), 20L, TimeUnit.SECONDS); } return Boolean.TRUE; } @@ -298,27 +307,27 @@ public class CompetitionServiceImpl implements ICompetitionService public Boolean challengeConfirm(Competition entity) { //使用赛会名称加密缓存防止重复提交 Object key = redisService.getCacheObject(Constants.COMPETITION_CREATE_KEY + DigestUtil.md5(entity.getCompetitionName().trim())); - if(UtilTool.isNotNull(key)){ + if (UtilTool.isNotNull(key)) { throw new ServiceException("当前创建赛会数据已提交到系统，毋须重复提交！"); } LoginUser user = SecurityUtils.getLoginUser(); entity.setCreatedBy(String.valueOf(user.getUserid())); entity.setCreatedTime(new Date()); DateFormat sdf = new SimpleDateFormat("yyyyMMdd"); - entity.setCompetitionCode(sdf.format(new Date())+ RandomStringUtils.randomNumeric(6)); + entity.setCompetitionCode(sdf.format(new Date()) + RandomStringUtils.randomNumeric(6)); //判断是否已经存在 List dbList = competitionMapper.selectCompetitionList(Competition.builder().competitionNature(entity.getCompetitionNature()) .competitionName(entity.getCompetitionName()).build()); - if(dbList.size()>0) { + if (dbList.size() > 0) { throw new ServiceException("当前赛会已存在，毋须重复提交！"); } //小程序-推送赛会通知给系统管理员。管理员好及时去审核赛会 List userRoles = userRoleMapper.selectUserRoleList(UserRole.builder().roleCode(UserRoles.ADMIN.code()).build()); List userIds = userRoles.stream().map(UserRole::getUserId).collect(Collectors.toList()); List managerUsers = wxUserMapper.listByIds(userIds); - if(!StringUtils.isEmpty(managerUsers)&&!StringUtils.isEmpty(managerUsers.size()>0)){ - for (WxUser managerUser:managerUsers){ - if(!StringUtils.isEmpty(managerUser.getOpenid())) { + if (!StringUtils.isEmpty(managerUsers) && !StringUtils.isEmpty(managerUsers.size() > 0)) { + for (WxUser managerUser : managerUsers) { + if (!StringUtils.isEmpty(managerUser.getOpenid())) { WxMssVo wxMssVo = new WxMssVo(); wxMssVo.setTemplate_id(WxAppletsTemplateIdsEnum.COMPETITION_SIGN_UP.getCode()); wxMssVo.setTouser(managerUser.getOpenid()); @@ -332,11 +341,11 @@ public class CompetitionServiceImpl implements ICompetitionService } } } - if(ObjectUtil.isNull(entity.getId())) { + if (ObjectUtil.isNull(entity.getId())) { if (competitionMapper.insertCompetition(entity) > 0) { redisService.setCacheObject(Constants.COMPETITION_CREATE_KEY + DigestUtil.md5(entity.getCompetitionName().trim()), entity.getCompetitionName(), 20L, TimeUnit.SECONDS); } - }else { + } else { competitionMapper.updateCompetition(entity); } return Boolean.TRUE; @@ -344,16 +353,16 @@ public class CompetitionServiceImpl implements ICompetitionService @Override public List getMyJoinCompetition(CompetitionVo competition) { - List list=competitionMapper.getMyJoinCompetition(competition); - for (Competition comp:list){ - if(competition.getCompetitionNature()==0){ + List list = competitionMapper.getMyJoinCompetition(competition); + for (Competition comp : list) { + if (competition.getCompetitionNature() == 0) { WxBasketballTeam mainTeam = wxBasketballTeamMapper.selectWxBasketballTeamById(comp.getMainTeamId()); - if(!org.springframework.util.ObjectUtils.isEmpty(mainTeam)) { + if (!org.springframework.util.ObjectUtils.isEmpty(mainTeam)) { comp.setMainTeamLogo(mainTeam.getTeamLogo()); } - if(comp.getGuestTeamId()!=null) { + if (comp.getGuestTeamId() != null) { WxBasketballTeam guestTeam = wxBasketballTeamMapper.selectWxBasketballTeamById(comp.getGuestTeamId()); - if(!org.springframework.util.ObjectUtils.isEmpty(guestTeam)) { + if (!org.springframework.util.ObjectUtils.isEmpty(guestTeam)) { comp.setGuestTeamLogo(guestTeam.getTeamLogo()); } } @@ -361,11 +370,12 @@ public class CompetitionServiceImpl implements ICompetitionService } return list; } + @Transactional @Override public Boolean add(Competition entity) { entity.setCompetitionNature(0); - Long id=entity.getId(); + Long id = entity.getId(); LoginUser user = SecurityUtils.getLoginUser(); //判断是否存在 List competitions = competitionMapper.selectCompetitionList(Competition.builder() @@ -373,11 +383,11 @@ public class CompetitionServiceImpl implements ICompetitionService .mainTeamId(entity.getMainTeamId()) .buildingId(entity.getBuildingId()) .cityCode(entity.getCityCode()).build()); - if(competitions.size()>0){ + if (competitions.size() > 0) { throw new ServiceException("当前约战数据已存在，毋须重复提交！"); } //获取场馆数据 - if(!StringUtils.isEmpty(entity.getBuildingId())){ + if (!StringUtils.isEmpty(entity.getBuildingId())) { WxBuildingInfo buildingInfo = wxBuildingInfoService.selectWxBuildingInfoById(entity.getBuildingId()); entity.setBuildingName(buildingInfo.getBuildingName()); entity.setCityCode(buildingInfo.getCityCode()); @@ -390,12 +400,12 @@ public class CompetitionServiceImpl implements ICompetitionService entity.setCreatedTime(new Date()); entity.setFounder(user.getUserid()); entity.setStatus(CompetitionStatusEnum.TREATY_WAR.getValue()); - if(ObjectUtil.isNull(entity.getId())){ + if (ObjectUtil.isNull(entity.getId())) { competitionMapper.insertCompetition(entity); - }else { + } else { competitionMapper.updateCompetition(entity); } - if(!StringUtils.isEmpty(entity.getGuestTeamId())) { + if (!StringUtils.isEmpty(entity.getGuestTeamId())) { TeamMembers teamMembers = teamMembersService.getOneByTeamIdAndRoleCode(entity.getGuestTeamId(), RoleEnum.TEAM_MANAGER.getCode()); //如果指定了约战的对象就需要给约战的球队的队长发一个消息 Message message = new Message(); @@ -407,23 +417,23 @@ public class CompetitionServiceImpl implements ICompetitionService message.setSourceId(entity.getId()); message.setFlowEntity(JSON.toJSONString(entity)); message.setCreatedTime(new Date()); - message.setMessageTitle("您收到一条【"+entity.getMainTeamName()+"】"+FowTypeEnum.MAKE_AN_APPOINTMENT.getDesc()+"，请及时处理"); + message.setMessageTitle("您收到一条【" + entity.getMainTeamName() + "】" + FowTypeEnum.MAKE_AN_APPOINTMENT.getDesc() + "，请及时处理"); messageService.insertMessage(message); //小程序-查询用户数据看看是否可以推送服务消息根据unionId是否存在 WxUser guestUser = wxUserMapper.selectWxUserById(teamMembers.getUserId()); - if(!StringUtils.isEmpty(guestUser)&&!StringUtils.isEmpty(guestUser.getOpenid())){ - WxMssVo wxMssVo=new WxMssVo(); + if (!StringUtils.isEmpty(guestUser) && !StringUtils.isEmpty(guestUser.getOpenid())) { + WxMssVo wxMssVo = new WxMssVo(); wxMssVo.setTemplate_id(WxAppletsTemplateIdsEnum.TREATY_WAR.getCode()); wxMssVo.setTouser(guestUser.getOpenid()); Map map = new HashMap<>(); - map.put("thing1",new TemplateDataVo(entity.getMainTeamName())); - map.put("thing2",new TemplateDataVo(entity.getGuestTeamName())); - map.put("thing3",new TemplateDataVo("您有新的约战信息，请在小程序中进行处理")); + map.put("thing1", new TemplateDataVo(entity.getMainTeamName())); + map.put("thing2", new TemplateDataVo(entity.getGuestTeamName())); + map.put("thing3", new TemplateDataVo("您有新的约战信息，请在小程序中进行处理")); wxMssVo.setData(map); wxAppletsService.pushOneUser(wxMssVo); } } - if(StringUtils.isEmpty(id)) { + if (StringUtils.isEmpty(id)) { //保存创建人到比赛参与人员表 CompetitionMembers competitionMembers = new CompetitionMembers(); competitionMembers.setCompetitionId(entity.getId()); @@ -438,6 +448,7 @@ public class CompetitionServiceImpl implements ICompetitionService } return true; } + @Override public Boolean edit(Competition entity) { LoginUser user = SecurityUtils.getLoginUser(); @@ -449,7 +460,7 @@ public class CompetitionServiceImpl implements ICompetitionService @Transactional(rollbackFor = Exception.class) @Override - public CompetitionExcleVo importExcleData(Long competitionId,Map maplist, Sheet sheet) { + public CompetitionExcleVo importExcleData(Long competitionId, Map maplist, Sheet sheet) { CompetitionExcleVo excleVo = new CompetitionExcleVo(); String time = new SimpleDateFormat("yyyy-MM-dd").format(new Date()); //System.out.println("获取到精确到日的时间格式为"+time); @@ -530,13 +541,13 @@ public class CompetitionServiceImpl implements ICompetitionService throw new CheckedException("球队人数不能为空"); } //todo 校验是否是整数 - if(!NumberUtil.isInteger(teamUserNum)){ + if (!NumberUtil.isInteger(teamUserNum)) { throw new CheckedException("球队人数必须是正整数"); } //todo 获取到数据后，开始保存数据 LoginUser user = SecurityUtils.getLoginUser(); String userId = null; - if(ObjectUtil.isNotNull(user)&&ObjectUtil.isNotNull(user.getUserid())){ + if (ObjectUtil.isNotNull(user) && ObjectUtil.isNotNull(user.getUserid())) { userId = String.valueOf(user.getUserid()); } CompetitionOfTeamVo team = new CompetitionOfTeamVo(); @@ -573,7 +584,7 @@ public class CompetitionServiceImpl implements ICompetitionService if (UtilTool.isNotNull(competitionOfTeam)) { team.setId(competitionOfTeam.getId()); competitionOfTeamMapper.updateCompetitionOfTeam(team); - }else { + } else { competitionOfTeamMapper.insertCompetitionOfTeam(team); } excleVo.setOfTeam(team); @@ -617,8 +628,8 @@ public class CompetitionServiceImpl implements ICompetitionService if (cell != null) { cell.setCellType(CellType.STRING); //todo 校验是否是整数 - if(!NumberUtil.isInteger(cell.getStringCellValue())){ - throw new CheckedException(membersVo.getRealName()+" 的身高必须是正整数"); + if (!NumberUtil.isInteger(cell.getStringCellValue())) { + throw new CheckedException(membersVo.getRealName() + " 的身高必须是正整数"); } membersVo.setHeight(new BigDecimal(cell.getStringCellValue())); } @@ -627,8 +638,8 @@ public class CompetitionServiceImpl implements ICompetitionService if (cell != null) { cell.setCellType(CellType.STRING); //todo 校验是否是整数 - if(!NumberUtil.isInteger(cell.getStringCellValue())){ - throw new CheckedException(membersVo.getRealName()+" 的体重必须是正整数"); + if (!NumberUtil.isInteger(cell.getStringCellValue())) { + throw new CheckedException(membersVo.getRealName() + " 的体重必须是正整数"); } membersVo.setWeight(new BigDecimal(cell.getStringCellValue())); } @@ -652,9 +663,9 @@ public class CompetitionServiceImpl implements ICompetitionService //membersVo.setAvatar(domainName+datePath+newFileName); //保存图片 PictureData pictureData2 = maplist.get(i + "_0"); - log.info(membersVo.getRealName()+" 开始导入，图片位置"+i + "_0"); + log.info(membersVo.getRealName() + " 开始导入，图片位置" + i + "_0"); if (pictureData2 == null) { - throw new CheckedException(membersVo.getRealName()+" 的头像插入方式错误,请先选中单元格然后插入图片"); + throw new CheckedException(membersVo.getRealName() + " 的头像插入方式错误,请先选中单元格然后插入图片"); } byte[] data2 = pictureData2.getData(); String newFileName2 = UUID.randomUUID() + "_0.jpg"; @@ -691,6 +702,248 @@ public class CompetitionServiceImpl implements ICompetitionService return excleVo; } + @Override + public CompetitionExcleVo importExcleDataUserAvatar(Long competitionId, Map maplist, Sheet sheet) { + CompetitionExcleVo excleVo = new CompetitionExcleVo(); + String time = new SimpleDateFormat("yyyy-MM-dd").format(new Date()); + //System.out.println("获取到精确到日的时间格式为"+time); + String[] str = time.split("-");//根据‘-’进行拆分字符串 拆分出来的日期有，年，日，月，根据年日月创建文件夹 + String datePath = "/" + str[0] + "/" + str[1] + "/" + str[2] + "/"; + //读图片--结束 + // printImg(maplist); + //获得数据的总行数 + int totalRowNum = sheet.getPhysicalNumberOfRows(); + //todo 获取赛事编码 + Row row1 = sheet.getRow(1); + Cell cell1 = row1.getCell(5); + if (cell1 == null) { + throw new CheckedException("赛事编码不能为空"); + } + cell1.setCellType(CellType.STRING); + String competitionCode = cell1.getStringCellValue().toString(); + if (StringUtils.isEmpty(competitionCode)) { + throw new CheckedException("赛事编码不能为空"); + } + log.info("开始导入-->赛事编码:" + competitionCode); + Row row5 = sheet.getRow(5); + Cell cell5_1 = row5.getCell(0); + if (cell5_1 == null) { + throw new CheckedException("球队logo不能为空"); + } + cell5_1.setCellType(CellType.STRING); + //todo 获取赛事信息 + Competition competition = competitionMapper.selectCompetitionById(competitionId); + //校验比赛编码是否是本 + BeanUtil.copyProperties(competition, excleVo); + if (UtilTool.isNull(competition)) { + throw new CheckedException("赛会信息不存在;"); + } + if (!competition.getCompetitionCode().equals(competitionCode)) { + throw new CheckedException("导入的文件中的赛事编码错误"); + } + Cell cell5_2 = row5.getCell(1); + if (cell5_2 == null) { + throw new CheckedException("球队名称不能为空"); + } + cell5_2.setCellType(CellType.STRING); + String teamName = cell5_2.getStringCellValue().trim(); + if (StringUtils.isEmpty(teamName)) { + throw new CheckedException("球队名称不能为空"); + } + //球队队长 + Cell cell5_2_1 = row5.getCell(4); + String captain = ""; + if (cell5_2_1 != null) { + captain = cell5_2_1.getStringCellValue(); + } + Cell cell5_3 = row5.getCell(5); + if (cell5_3 == null) { + throw new CheckedException("球队领队不能为空"); + } + cell5_3.setCellType(CellType.STRING); + String teamLeader = cell5_3.getStringCellValue(); + if (StringUtils.isEmpty(teamLeader)) { + throw new CheckedException("球队领队不能为空"); + } + Cell cell5_4 = row5.getCell(6); + if (cell5_4 == null) { + throw new CheckedException("球队领队手机号码不能为空"); + } + cell5_4.setCellType(CellType.STRING); + String teamLeaderTel = cell5_4.getStringCellValue().toString(); + if (StringUtils.isEmpty(teamLeaderTel)) { + throw new CheckedException("球队队长手机号码不能为空"); + } + Cell cell5_5 = row5.getCell(7); + if (cell5_5 == null) { + throw new CheckedException("球队人数不能为空"); + } + cell5_5.setCellType(CellType.STRING); + String teamUserNum = cell5_5.getStringCellValue(); + if (StringUtils.isEmpty(teamUserNum)) { + throw new CheckedException("球队人数不能为空"); + } + //todo 校验是否是整数 + if (!NumberUtil.isInteger(teamUserNum)) { + throw new CheckedException("球队人数必须是正整数"); + } + //todo 获取到数据后，开始保存数据 + LoginUser user = SecurityUtils.getLoginUser(); + String userId = null; + if (ObjectUtil.isNotNull(user) && ObjectUtil.isNotNull(user.getUserid())) { + userId = String.valueOf(user.getUserid()); + } + CompetitionOfTeam team = competitionOfTeamMapper.selectOneByTeamName(teamName); + if(ObjectUtil.isNull(team)){ + team = new CompetitionOfTeam(); + } + team.setTeamName(teamName); + team.setRemark("导入方式报名"); + team.setContactsTel(teamLeaderTel); + team.setContacts(teamLeader); + team.setCaptain(captain); + team.setCreatedTime(new Date()); + team.setCreatedBy(userId); + team.setCreatedTime(new Date()); + team.setSerialNumber(Integer.parseInt(teamUserNum)); + team.setCompetitionId(competition.getId()); + //保存图片 + PictureData pictureData = maplist.get("5_0"); + if (pictureData == null) { + throw new UtilException("球队logo不能为空"); + } + byte[] data = pictureData.getData(); + //得到保存的file + String osPath = linuxLocation; + String os = System.getProperty("os.name"); + if (os.toLowerCase().startsWith("win")) { + osPath = winLocation; + } + String newFileName = UUID.randomUUID() + "_5.jpg"; + String uploadpath = UtilTool.getFileUploadPath(osPath); + File file2 = UtilTool.bytesToFile(data, uploadpath, newFileName); + // team.setTeamLogo(domainName + datePath + newFileName); + team.setStatus(0); + System.out.println(JSON.toJSONString(team)); + //todo 保存球队数据; + if (UtilTool.isNotNull(team)) { + competitionOfTeamMapper.updateCompetitionOfTeam(team); + } else { + competitionOfTeamMapper.insertCompetitionOfTeam(team); + } + excleVo.setOfTeam(team); + //查询已经存在的球员 + CompetitionMembers param = new CompetitionMembers(); + param.setCompetitionOfTeamId(team.getId()); + param.setCompetitionId(competitionId); + List dbMembersList = competitionMembersMapper.selectCompetitionMembersList(param); + //要获得属性 + List membersVos = new ArrayList<>(); + + for (int i = 8; i < totalRowNum; i++) { + CompetitionMembers membersVo = new CompetitionMembers(); + membersVo.setCompetitionId(competition.getId()); + membersVo.setCompetitionOfTeamId(team.getId()); + membersVo.setCompetitionNature(1); + membersVo.setCreatedBy(userId); + membersVo.setCreatedTime(new Date()); + //获得第i行对象 + Row row = sheet.getRow(i); + //真实姓名 + Cell cell = row.getCell(1); + if (cell != null) { + cell.setCellType(CellType.STRING); + } + membersVo.setRealName(cell.getStringCellValue()); + if (StringUtils.isEmpty(membersVo.getRealName())) { + break; + } + //通过查询到的球员数据赋值Id + Optional opt = dbMembersList.stream().filter(a -> a.getCompetitionId().equals(competition.getId()) + && a.getRealName().equals(membersVo.getRealName()) + && a.getCompetitionOfTeamId().equals(membersVo.getCompetitionOfTeamId())).findFirst(); + if(opt.isPresent()){ + membersVo.setId(opt.get().getId()); + }else { + continue; + } + //球衣号码 + cell = row.getCell(2); + if (cell != null) { + cell.setCellType(CellType.STRING); + membersVo.setJerseyNumber(cell.getStringCellValue()); + } + //位置 + cell = row.getCell(3); + if (cell != null) { + cell.setCellType(CellType.STRING); + membersVo.setTeamPosition(cell.getStringCellValue()); + } + //身高 + cell = row.getCell(4); + if (cell != null) { + cell.setCellType(CellType.STRING); + //todo 校验是否是整数 + if (!NumberUtil.isInteger(cell.getStringCellValue())) { + throw new CheckedException(membersVo.getRealName() + " 的身高必须是正整数"); + } + membersVo.setHeight(new BigDecimal(cell.getStringCellValue())); + } + //体重 + cell = row.getCell(5); + if (cell != null) { + cell.setCellType(CellType.STRING); + //todo 校验是否是整数 + if (!NumberUtil.isInteger(cell.getStringCellValue())) { + throw new CheckedException(membersVo.getRealName() + " 的体重必须是正整数"); + } + membersVo.setWeight(new BigDecimal(cell.getStringCellValue())); + } + //证件号码 + cell = row.getCell(6); + if (cell != null) { + membersVo.setIdType("身份证"); + membersVo.setIdCardNo(cell.getStringCellValue()); + } + //电话 + cell = row.getCell(7); + if (cell != null) { + membersVo.setContactsAreaCode("86"); + membersVo.setContactsTel(String.valueOf(((XSSFCell) cell).getRawValue())); + } + //电话 + cell = row.getCell(8); + if (cell != null) { + membersVo.setIdCardNo(String.valueOf(((XSSFCell) cell).getRawValue())); + } + //membersVo.setAvatar(domainName+datePath+newFileName); + //保存图片 + PictureData pictureData2 = maplist.get(i + "_0"); + log.info(membersVo.getRealName() + " 开始导入，图片位置" + i + "_0"); + if (pictureData2 == null) { + throw new CheckedException(membersVo.getRealName() + " 的头像插入方式错误,请先选中单元格然后插入图片"); + } + byte[] data2 = pictureData2.getData(); + String newFileName2 = UUID.randomUUID() + "_0.jpg"; + String uploadpath2 = UtilTool.getFileUploadPath(osPath); + File file3 = UtilTool.bytesToFile(data2, uploadpath2, newFileName2); + membersVo.setPersonalPhoto(domainName + datePath + newFileName2); + membersVo.setCreatedTime(new Date()); + //默认球员是已确认状态 + membersVo.setStatus(1); + System.out.println(JSON.toJSONString((membersVo))); + membersVo.setCreatedBy(userId); + membersVos.add(membersVo); + if(ObjectUtil.isEmpty(membersVo.getId())) { + competitionMembersMapper.insertCompetitionMembers(membersVo); + }else { + competitionMembersMapper.updateCompetitionMembers(membersVo); + } + } + excleVo.setTeamMemberList(membersVos); + return excleVo; + } + @Override public int updateCompetitionFinish() { return competitionMapper.updateCompetitionFinish(); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionSharePermissionsServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionSharePermissionsServiceImpl.java index e268e7f7..9fe4ae74 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionSharePermissionsServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionSharePermissionsServiceImpl.java @@ -1,18 +1,17 @@ package com.ruoyi.system.service.impl; -import java.util.Arrays; -import java.util.List; - import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.core.exception.CheckedException; -import com.ruoyi.system.domain.vo.CompetitionSharePermissionsVo; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.ruoyi.system.mapper.CompetitionSharePermissionsMapper; import com.ruoyi.system.domain.CompetitionSharePermissions; +import com.ruoyi.system.mapper.CompetitionSharePermissionsMapper; import com.ruoyi.system.service.ICompetitionSharePermissionsService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.List; + /** * 赛会-权限分享Service业务层处理 * @@ -20,7 +19,7 @@ import org.springframework.transaction.annotation.Transactional; * @date 2023-07-20 */ @Service -public class CompetitionSharePermissionsServiceImpl implements ICompetitionSharePermissionsService +public class CompetitionSharePermissionsServiceImpl extends ServiceImpl implements ICompetitionSharePermissionsService { @Autowired private CompetitionSharePermissionsMapper competitionSharePermissionsMapper; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionTeamGroupServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionTeamGroupServiceImpl.java index 5ab00b5a..97683ca9 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionTeamGroupServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionTeamGroupServiceImpl.java @@ -1,8 +1,6 @@ package com.ruoyi.system.service.impl; -import java.util.*; -import java.util.concurrent.TimeUnit; - +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.core.constant.CacheConstants; import com.ruoyi.common.core.exception.ServiceException; import com.ruoyi.common.redis.service.RedisService; @@ -10,25 +8,24 @@ import com.ruoyi.common.security.utils.SecurityUtils; import com.ruoyi.system.api.model.LoginUser; import com.ruoyi.system.domain.Competition; import com.ruoyi.system.domain.CompetitionOfTeam; +import com.ruoyi.system.domain.CompetitionTeamGroup; import com.ruoyi.system.domain.CompetitionTeamVsTeam; import com.ruoyi.system.domain.vo.BegerArrangementVo; import com.ruoyi.system.domain.vo.CompetitionOfTeamVo; -import com.ruoyi.system.domain.vo.CompetitionTeamVsTeamVo; import com.ruoyi.system.domain.vo.TeamGroupRequest; import com.ruoyi.system.mapper.CompetitionMapper; import com.ruoyi.system.mapper.CompetitionOfTeamMapper; +import com.ruoyi.system.mapper.CompetitionTeamGroupMapper; import com.ruoyi.system.mapper.CompetitionTeamVsTeamMapper; +import com.ruoyi.system.service.ICompetitionTeamGroupService; import com.ruoyi.system.utils.BegerSingleCycleUtil; -import com.ruoyi.system.utils.LoginUserUtil; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.system.mapper.CompetitionTeamGroupMapper; -import com.ruoyi.system.domain.CompetitionTeamGroup; -import com.ruoyi.system.service.ICompetitionTeamGroupService; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.StringUtils; import javax.annotation.Resource; +import java.util.*; +import java.util.concurrent.TimeUnit; /** * 赛会中-分组Service业务层处理 @@ -37,7 +34,7 @@ import javax.annotation.Resource; * @date 2022-11-03 */ @Service -public class CompetitionTeamGroupServiceImpl implements ICompetitionTeamGroupService +public class CompetitionTeamGroupServiceImpl extends ServiceImpl implements ICompetitionTeamGroupService { @Resource private CompetitionTeamGroupMapper competitionTeamGroupMapper; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionTeamVsTeamServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionTeamVsTeamServiceImpl.java index e2e736ca..cb0bc40c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionTeamVsTeamServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionTeamVsTeamServiceImpl.java @@ -1,32 +1,29 @@ package com.ruoyi.system.service.impl; -import java.security.InvalidParameterException; -import java.util.*; -import java.util.stream.Collectors; -import java.util.stream.Stream; - import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.core.exception.ServiceException; import com.ruoyi.common.security.utils.SecurityUtils; import com.ruoyi.system.api.model.LoginUser; -import com.ruoyi.system.api.model.WxLoginUser; import com.ruoyi.system.domain.CompetitionMembersScore; import com.ruoyi.system.domain.CompetitionResult; +import com.ruoyi.system.domain.CompetitionTeamVsTeam; import com.ruoyi.system.domain.vo.*; import com.ruoyi.system.mapper.CompetitionMembersScoreMapper; import com.ruoyi.system.mapper.CompetitionResultMapper; +import com.ruoyi.system.mapper.CompetitionTeamVsTeamMapper; +import com.ruoyi.system.service.ICompetitionMembersScoreService; import com.ruoyi.system.service.ICompetitionResultService; -import com.ruoyi.system.utils.LoginUserUtil; +import com.ruoyi.system.service.ICompetitionTeamVsTeamService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.system.mapper.CompetitionTeamVsTeamMapper; -import com.ruoyi.system.domain.CompetitionTeamVsTeam; -import com.ruoyi.system.service.ICompetitionTeamVsTeamService; import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; import javax.annotation.Resource; +import java.security.InvalidParameterException; +import java.util.*; +import java.util.stream.Collectors; /** * 赛会中-球队VS球队关系Service业务层处理 @@ -35,16 +32,19 @@ import javax.annotation.Resource; * @date 2022-11-03 */ @Service -public class CompetitionTeamVsTeamServiceImpl implements ICompetitionTeamVsTeamService +public class CompetitionTeamVsTeamServiceImpl extends ServiceImpl implements ICompetitionTeamVsTeamService { @Autowired private CompetitionTeamVsTeamMapper competitionTeamVsTeamMapper; + @Resource + private CompetitionResultMapper competitionResultMapper; @Resource private ICompetitionResultService competitionResultService; @Resource private CompetitionMembersScoreMapper competitionMembersScoreMapper; - + @Resource + private ICompetitionMembersScoreService competitionMembersScoreService; /** * 查询赛会中-球队VS球队关系 * @@ -100,8 +100,12 @@ public class CompetitionTeamVsTeamServiceImpl implements ICompetitionTeamVsTeamS * @return 结果 */ @Override + @Transactional public int deleteCompetitionTeamVsTeamByIds(Long[] ids) { + //删除赛程的时候同时删除比赛结果 + competitionResultService.lambdaUpdate().in(CompetitionResult::getCompetitionVsId,ids).remove(); + competitionMembersScoreService.lambdaUpdate().in(CompetitionMembersScore::getCompetitionVsId,ids).remove(); return competitionTeamVsTeamMapper.deleteCompetitionTeamVsTeamByIds(ids); } @@ -127,7 +131,7 @@ public class CompetitionTeamVsTeamServiceImpl implements ICompetitionTeamVsTeamS unifiedRecordVo.setTeamVsTeamVo(competitionTeamVsTeamVo); //查询队伍数据 - List competitionResultList = competitionResultService.findByCompetitionVsId(competitionTeamVsTeamVo.getCompetitionId(),competitionTeamVsTeamVo.getId()); + List competitionResultList = competitionResultMapper.findByCompetitionVsId(competitionTeamVsTeamVo.getCompetitionId(),competitionTeamVsTeamVo.getId()); unifiedRecordVo.setCompetitionResultList(competitionResultList); //查询赛程中个人成绩 @@ -138,7 +142,7 @@ public class CompetitionTeamVsTeamServiceImpl implements ICompetitionTeamVsTeamS //组装队伍球员数据并排序 if(competitionResultList!=null&&competitionResultList.size()>0){ //组装主队数据 - List mainMembersScoreList = membersScoreList.stream().filter(CompetitionMembersScore -> CompetitionMembersScore.getCompetitionOfTeamId()==competitionResultList.get(0).getCompetitionOfTeamId()).collect(Collectors.toList()); + List mainMembersScoreList = membersScoreList.stream().filter(CompetitionMembersScore -> CompetitionMembersScore.getCompetitionOfTeamId().equals(competitionResultList.get(0).getCompetitionOfTeamId())).collect(Collectors.toList()); //过滤首发球员 List firstList = mainMembersScoreList.stream().filter(a -> a.getIsFirstLaunch() == 1).collect(Collectors.toList()); firstList.sort((o1, o2) -> o2.getTotalScore().compareTo(o1.getTotalScore())); @@ -150,7 +154,7 @@ public class CompetitionTeamVsTeamServiceImpl implements ICompetitionTeamVsTeamS competitionMembersScoreList.addAll(mainMembersScoreList); //组装客队数据 - List gustMembersScoreList = membersScoreList.stream().filter(CompetitionMembersScore -> CompetitionMembersScore.getCompetitionOfTeamId()==competitionResultList.get(1).getCompetitionOfTeamId()).collect(Collectors.toList()); + List gustMembersScoreList = membersScoreList.stream().filter(CompetitionMembersScore -> CompetitionMembersScore.getCompetitionOfTeamId().equals(competitionResultList.get(1).getCompetitionOfTeamId())).collect(Collectors.toList()); //过滤首发球员 List gustFirstList = gustMembersScoreList.stream().filter(a -> a.getIsFirstLaunch() == 1).collect(Collectors.toList()); gustFirstList.sort((o1, o2) -> o2.getTotalScore().compareTo(o1.getTotalScore())); @@ -173,7 +177,7 @@ public class CompetitionTeamVsTeamServiceImpl implements ICompetitionTeamVsTeamS throw new ServiceException("赛程不存在"); } //获取主队每节数据 - List competitionResultList = competitionResultService.findByCompetitionVsId(competitionTeamVsTeamVo.getCompetitionId(),competitionTeamVsTeamVo.getId()); + List competitionResultList = competitionResultMapper.findByCompetitionVsId(competitionTeamVsTeamVo.getCompetitionId(),competitionTeamVsTeamVo.getId()); Optional main = competitionResultList.stream().filter(a -> a.getCompetitionOfTeamId().equals(competitionTeamVsTeamVo.getMainTeamId())).findFirst(); Optional guest = competitionResultList.stream().filter(a -> a.getCompetitionOfTeamId().equals(competitionTeamVsTeamVo.getGuestTeamId())).findFirst(); List membersScoreList = competitionMembersScoreMapper.findMembersScoreByCompetitionVsId(competitionTeamVsTeamVo.getCompetitionId(),competitionTeamVsTeamVo.getId()); @@ -259,9 +263,17 @@ public class CompetitionTeamVsTeamServiceImpl implements ICompetitionTeamVsTeamS return Boolean.TRUE; } + @Transactional @Override public Boolean competitionScoreSubmit(List request) { - + CompetitionTeamVsTeamVo teamVsTeam = new CompetitionTeamVsTeamVo(); + Optional opt = request.stream().findFirst(); + if(opt.isPresent()){ + CompetitionResult result = opt.get(); + teamVsTeam = competitionTeamVsTeamMapper.selectCompetitionTeamVsTeamById(result.getCompetitionVsId()); + } + Integer mainTeamScore = 0; + Integer guestTeamScore = 0; for(CompetitionResult competitionResult : request){ //小节分数可能为空 int oneNodeScore = competitionResult.getOneNodeScore()==null?0:competitionResult.getOneNodeScore(); @@ -270,32 +282,46 @@ public class CompetitionTeamVsTeamServiceImpl implements ICompetitionTeamVsTeamS int fourNodeScore = competitionResult.getFourNodeScore()==null?0:competitionResult.getFourNodeScore(); int fiveNodeScore = competitionResult.getFiveNodeScore()==null?0:competitionResult.getFiveNodeScore(); int sixNodeScore = competitionResult.getSixNodeScore()==null?0:competitionResult.getSixNodeScore(); - int score = oneNodeScore+twoNodeScore+threeNodeScore+fourNodeScore+fiveNodeScore+sixNodeScore; if(score>0&&competitionResult.getTotalScore()!=null){ if(score!=competitionResult.getTotalScore()){ throw new InvalidParameterException("总分和小节分之和 不等 请检查！"); } } else if(score==0&&competitionResult.getTotalScore()!=null){ - competitionResult.setOneNodeScore(competitionResult.getTotalScore()); + competitionResult.setOneNodeScore(score); + } + //主队 + if(teamVsTeam.getMainTeamId().equals(competitionResult.getCompetitionOfTeamId())){ + mainTeamScore = score; + } else {//客队 + guestTeamScore = score; } - //新增 if(competitionResult.getId()==null){ - competitionResultService.add(competitionResult); + competitionResultMapper.insertCompetitionResult(competitionResult); } else {//编辑 if(StringUtils.isEmpty(competitionResult.getId())){ throw new InvalidParameterException("id为空"); } - competitionResultService.edit(competitionResult); + competitionResultMapper.updateCompetitionResult(competitionResult); } } + //todo 更新赛程数据的比分 + CompetitionTeamVsTeam teamVs = new CompetitionTeamVsTeam(); + teamVs.setId(teamVsTeam.getId()); + teamVs.setMainTeamScore(mainTeamScore); + teamVs.setGuestTeamScore(guestTeamScore); + teamVs.setLastUpdatedTime(new Date()); + competitionTeamVsTeamMapper.updateCompetitionTeamVsTeam(teamVs); return true; } @Override public Boolean deleteBatchByIds(Ids ids) { Long[] idList = ids.getIdList().stream().toArray(Long[]::new); + //删除赛程的时候同时删除比赛结果 + competitionResultService.lambdaUpdate().in(CompetitionResult::getCompetitionVsId,idList).remove(); + competitionMembersScoreService.lambdaUpdate().in(CompetitionMembersScore::getCompetitionVsId,idList).remove(); competitionTeamVsTeamMapper.deleteCompetitionTeamVsTeamByIds(idList); return Boolean.TRUE; } @@ -307,6 +333,6 @@ public class CompetitionTeamVsTeamServiceImpl implements ICompetitionTeamVsTeamS @Override public List getTodaySchedule(CompetitionTeamVsTeam competitionTeamVsTeam) { - return competitionTeamVsTeamMapper.getTodaySchedule(competitionResultService); + return competitionTeamVsTeamMapper.getTodaySchedule(competitionTeamVsTeam); } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomerOrderServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomerOrderServiceImpl.java new file mode 100644 index 00000000..3edfd06b --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomerOrderServiceImpl.java @@ -0,0 +1,104 @@ +package com.ruoyi.system.service.impl; + +import java.util.List; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.core.utils.DateUtils; +import com.ruoyi.system.domain.vo.CustomerOrderVo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.system.mapper.CustomerOrderMapper; +import com.ruoyi.system.domain.CustomerOrder; +import com.ruoyi.system.service.ICustomerOrderService; + +/** + * 客户-订车Service业务层处理 + * + * @author ruoyi + * @date 2023-08-01 + */ +@Service +public class CustomerOrderServiceImpl extends ServiceImpl implements ICustomerOrderService +{ + @Autowired + private CustomerOrderMapper customerOrderMapper; + + /** + * 查询客户-订车 + * + * @param id 客户-订车主键 + * @return 客户-订车 + */ + @Override + public CustomerOrder selectCustomerOrderById(Long id) + { + return customerOrderMapper.selectCustomerOrderById(id); + } + + /** + * 查询客户-订车列表 + * + * @param customerOrder 客户-订车 + * @return 客户-订车 + */ + @Override + public List selectCustomerOrderList(CustomerOrder customerOrder) + { + return customerOrderMapper.selectCustomerOrderList(customerOrder); + } + + /** + * 新增客户-订车 + * + * @param customerOrder 客户-订车 + * @return 结果 + */ + @Override + public int insertCustomerOrder(CustomerOrder customerOrder) + { + customerOrder.setCreateTime(DateUtils.getNowDate()); + return customerOrderMapper.insertCustomerOrder(customerOrder); + } + + /** + * 修改客户-订车 + * + * @param customerOrder 客户-订车 + * @return 结果 + */ + @Override + public int updateCustomerOrder(CustomerOrder customerOrder) + { + customerOrder.setUpdateTime(DateUtils.getNowDate()); + return customerOrderMapper.updateCustomerOrder(customerOrder); + } + + /** + * 批量删除客户-订车 + * + * @param ids 需要删除的客户-订车主键 + * @return 结果 + */ + @Override + public int deleteCustomerOrderByIds(Long[] ids) + { + return customerOrderMapper.deleteCustomerOrderByIds(ids); + } + + /** + * 删除客户-订车信息 + * + * @param id 客户-订车主键 + * @return 结果 + */ + @Override + public int deleteCustomerOrderById(Long id) + { + return customerOrderMapper.deleteCustomerOrderById(id); + } + + @Override + public List getCustomerOrderPage(CustomerOrderVo customerOrder) { + return customerOrderMapper.getCustomerOrderPage(customerOrder); + } +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomerServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomerServiceImpl.java index e2988c62..15a9072b 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomerServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomerServiceImpl.java @@ -109,6 +109,11 @@ public class CustomerServiceImpl implements ICustomerService return customerMapper.deleteCustomerById(id); } + @Override + public List selectCustomerMakerList(CustomerVo customer) { + return customerMapper.selectCustomerMakerList(customer); + } + /** * 新增跟进模块-客户跟进记录信息 * diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/FeatureLabelServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/FeatureLabelServiceImpl.java index 10257cff..40256ef6 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/FeatureLabelServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/FeatureLabelServiceImpl.java @@ -1,11 +1,13 @@ package com.ruoyi.system.service.impl; -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.ruoyi.system.mapper.FeatureLabelMapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.system.domain.FeatureLabel; +import com.ruoyi.system.mapper.FeatureLabelMapper; import com.ruoyi.system.service.IFeatureLabelService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; /** * 球馆特征Service业务层处理 @@ -14,7 +16,7 @@ import com.ruoyi.system.service.IFeatureLabelService; * @date 2023-07-06 */ @Service -public class FeatureLabelServiceImpl implements IFeatureLabelService +public class FeatureLabelServiceImpl extends ServiceImpl implements IFeatureLabelService { @Autowired private FeatureLabelMapper featureLabelMapper; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/FollowUpServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/FollowUpServiceImpl.java index 4e4ae70d..b85f8a4c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/FollowUpServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/FollowUpServiceImpl.java @@ -2,7 +2,7 @@ package com.ruoyi.system.service.impl; import java.util.List; -import com.mybatisflex.spring.service.impl.ServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.core.utils.DateUtils; import com.ruoyi.system.domain.Customer; import com.ruoyi.system.mapper.CustomerMapper; @@ -63,12 +63,9 @@ public class FollowUpServiceImpl extends ServiceImpl i Customer customer = new Customer(); customer.setId(followUp.getCustomerId()); //如果跟进记录的跟进级别选择 - if("战败".equals(followUp.getFollowLevel())){ + if("fail".equals(followUp.getFollowResult())){ customer.setStatus("defeat"); customerMapper.updateCustomer(customer); - }else if("订车".equals(followUp.getFollowLevel())||"成交".equals(followUp.getFollowLevel())){ - customer.setStatus("order"); - customerMapper.updateCustomer(customer); } return followUpMapper.insertFollowUp(followUp); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/GlobalAttachmentServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/GlobalAttachmentServiceImpl.java index b3f24269..df8a0d00 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/GlobalAttachmentServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/GlobalAttachmentServiceImpl.java @@ -1,11 +1,13 @@ package com.ruoyi.system.service.impl; -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.ruoyi.system.mapper.GlobalAttachmentMapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.system.domain.GlobalAttachment; +import com.ruoyi.system.mapper.GlobalAttachmentMapper; import com.ruoyi.system.service.IGlobalAttachmentService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; /** * 【请填写功能名称】Service业务层处理 @@ -14,7 +16,7 @@ import com.ruoyi.system.service.IGlobalAttachmentService; * @date 2023-07-04 */ @Service -public class GlobalAttachmentServiceImpl implements IGlobalAttachmentService +public class GlobalAttachmentServiceImpl extends ServiceImpl implements IGlobalAttachmentService { @Autowired private GlobalAttachmentMapper globalAttachmentMapper; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/GroupWechatServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/GroupWechatServiceImpl.java index 3f62f6eb..2d6d8386 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/GroupWechatServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/GroupWechatServiceImpl.java @@ -1,11 +1,13 @@ package com.ruoyi.system.service.impl; -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.ruoyi.system.mapper.GroupWechatMapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.system.domain.GroupWechat; +import com.ruoyi.system.mapper.GroupWechatMapper; import com.ruoyi.system.service.IGroupWechatService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; /** * 【请填写功能名称】Service业务层处理 @@ -14,7 +16,7 @@ import com.ruoyi.system.service.IGroupWechatService; * @date 2023-07-04 */ @Service -public class GroupWechatServiceImpl implements IGroupWechatService +public class GroupWechatServiceImpl extends ServiceImpl implements IGroupWechatService { @Autowired private GroupWechatMapper groupWechatMapper; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/MessageServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/MessageServiceImpl.java index 573f7717..cdd78913 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/MessageServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/MessageServiceImpl.java @@ -1,11 +1,13 @@ package com.ruoyi.system.service.impl; -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.ruoyi.system.mapper.MessageMapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.system.domain.Message; +import com.ruoyi.system.mapper.MessageMapper; import com.ruoyi.system.service.IMessageService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; /** * 【请填写功能名称】Service业务层处理 @@ -14,7 +16,7 @@ import com.ruoyi.system.service.IMessageService; * @date 2023-07-04 */ @Service -public class MessageServiceImpl implements IMessageService +public class MessageServiceImpl extends ServiceImpl implements IMessageService { @Autowired private MessageMapper messageMapper; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TeamMembersServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TeamMembersServiceImpl.java index 22853254..d8c7b8bc 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TeamMembersServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TeamMembersServiceImpl.java @@ -1,18 +1,18 @@ package com.ruoyi.system.service.impl; -import java.util.List; - import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.security.utils.SecurityUtils; import com.ruoyi.system.api.model.LoginUser; +import com.ruoyi.system.domain.TeamMembers; import com.ruoyi.system.domain.vo.TeamMembersResponse; import com.ruoyi.system.domain.vo.TeamMembersVo; -import com.ruoyi.system.utils.LoginUserUtil; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import com.ruoyi.system.mapper.TeamMembersMapper; -import com.ruoyi.system.domain.TeamMembers; import com.ruoyi.system.service.ITeamMembersService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; /** * 球队人员Service业务层处理 @@ -21,7 +21,7 @@ import com.ruoyi.system.service.ITeamMembersService; * @date 2022-11-03 */ @Service -public class TeamMembersServiceImpl implements ITeamMembersService +public class TeamMembersServiceImpl extends ServiceImpl implements ITeamMembersService { @Autowired private TeamMembersMapper teamMembersMapper; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TrainingInfoServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TrainingInfoServiceImpl.java index 68fb4ae0..28339c83 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TrainingInfoServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TrainingInfoServiceImpl.java @@ -1,11 +1,13 @@ package com.ruoyi.system.service.impl; -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.ruoyi.system.mapper.TrainingInfoMapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.system.domain.TrainingInfo; +import com.ruoyi.system.mapper.TrainingInfoMapper; import com.ruoyi.system.service.ITrainingInfoService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; /** * 【请填写功能名称】Service业务层处理 @@ -14,7 +16,7 @@ import com.ruoyi.system.service.ITrainingInfoService; * @date 2023-07-04 */ @Service -public class TrainingInfoServiceImpl implements ITrainingInfoService +public class TrainingInfoServiceImpl extends ServiceImpl implements ITrainingInfoService { @Autowired private TrainingInfoMapper trainingInfoMapper; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserBuildingRelServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserBuildingRelServiceImpl.java index 28ff21c8..5250df72 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserBuildingRelServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserBuildingRelServiceImpl.java @@ -1,11 +1,13 @@ package com.ruoyi.system.service.impl; -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.ruoyi.system.mapper.UserBuildingRelMapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.system.domain.UserBuildingRel; +import com.ruoyi.system.mapper.UserBuildingRelMapper; import com.ruoyi.system.service.IUserBuildingRelService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; /** * 【请填写功能名称】Service业务层处理 @@ -14,7 +16,7 @@ import com.ruoyi.system.service.IUserBuildingRelService; * @date 2023-07-04 */ @Service -public class UserBuildingRelServiceImpl implements IUserBuildingRelService +public class UserBuildingRelServiceImpl extends ServiceImpl implements IUserBuildingRelService { @Autowired private UserBuildingRelMapper userBuildingRelMapper; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserRoleServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserRoleServiceImpl.java index b181dd7d..d3f49025 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserRoleServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserRoleServiceImpl.java @@ -1,11 +1,13 @@ package com.ruoyi.system.service.impl; -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.ruoyi.system.mapper.UserRoleMapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.system.domain.UserRole; +import com.ruoyi.system.mapper.UserRoleMapper; import com.ruoyi.system.service.IUserRoleService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; /** * 【请填写功能名称】Service业务层处理 @@ -14,7 +16,7 @@ import com.ruoyi.system.service.IUserRoleService; * @date 2023-07-04 */ @Service -public class UserRoleServiceImpl implements IUserRoleService +public class UserRoleServiceImpl extends ServiceImpl implements IUserRoleService { @Autowired private UserRoleMapper userRoleMapper; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserWxAqrCodeServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserWxAqrCodeServiceImpl.java index eee7845a..66b094cb 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserWxAqrCodeServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserWxAqrCodeServiceImpl.java @@ -1,22 +1,22 @@ package com.ruoyi.system.service.impl; -import java.util.Date; -import java.util.List; -import java.util.Map; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.common.security.utils.SecurityUtils; import com.ruoyi.system.api.domain.vo.WxAppletsCodeVo; import com.ruoyi.system.api.feign.WxAppletsFeign; +import com.ruoyi.system.domain.UserWxAqrCode; import com.ruoyi.system.domain.vo.UserWxAqrCodeVo; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import com.ruoyi.system.mapper.UserWxAqrCodeMapper; -import com.ruoyi.system.domain.UserWxAqrCode; import com.ruoyi.system.service.IUserWxAqrCodeService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; import javax.annotation.Resource; +import java.util.Date; +import java.util.List; /** * 微信用户小程序二维码Service业务层处理 @@ -25,7 +25,7 @@ import javax.annotation.Resource; * @date 2022-10-18 */ @Service -public class UserWxAqrCodeServiceImpl implements IUserWxAqrCodeService +public class UserWxAqrCodeServiceImpl extends ServiceImpl implements IUserWxAqrCodeService { @Autowired private UserWxAqrCodeMapper userWxAqrCodeMapper; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WxBasketballTeamServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WxBasketballTeamServiceImpl.java index b0cd979c..9066cda3 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WxBasketballTeamServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WxBasketballTeamServiceImpl.java @@ -1,11 +1,13 @@ package com.ruoyi.system.service.impl; -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.ruoyi.system.mapper.WxBasketballTeamMapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.system.domain.WxBasketballTeam; +import com.ruoyi.system.mapper.WxBasketballTeamMapper; import com.ruoyi.system.service.IWxBasketballTeamService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; /** * 球队管理Service业务层处理 @@ -14,7 +16,7 @@ import com.ruoyi.system.service.IWxBasketballTeamService; * @date 2022-08-30 */ @Service -public class WxBasketballTeamServiceImpl implements IWxBasketballTeamService +public class WxBasketballTeamServiceImpl extends ServiceImpl implements IWxBasketballTeamService { @Autowired private WxBasketballTeamMapper wxBasketballTeamMapper; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WxBuildingInfoServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WxBuildingInfoServiceImpl.java index 273788ae..6ac725fb 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WxBuildingInfoServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WxBuildingInfoServiceImpl.java @@ -1,26 +1,26 @@ package com.ruoyi.system.service.impl; -import java.util.ArrayList; -import java.util.List; -import java.util.Set; -import java.util.stream.Collectors; - -import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.security.utils.SecurityUtils; import com.ruoyi.system.api.model.LoginUser; -import com.ruoyi.system.api.model.WxLoginUser; -import com.ruoyi.system.domain.*; +import com.ruoyi.system.domain.BuildingInfoDetail; +import com.ruoyi.system.domain.BuildingLabel; +import com.ruoyi.system.domain.FeatureLabel; +import com.ruoyi.system.domain.WxBuildingInfo; import com.ruoyi.system.domain.vo.BuildingInfoRequest; import com.ruoyi.system.domain.vo.BuildingInfoResponse; import com.ruoyi.system.mapper.*; -import com.ruoyi.system.utils.LoginUserUtil; +import com.ruoyi.system.service.IWxBuildingInfoService; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.system.service.IWxBuildingInfoService; import org.springframework.util.ObjectUtils; import org.springframework.util.StringUtils; +import java.util.ArrayList; +import java.util.List; +import java.util.Set; + /** * 球场管理Service业务层处理 * @@ -28,7 +28,7 @@ import org.springframework.util.StringUtils; * @date 2022-08-30 */ @Service -public class WxBuildingInfoServiceImpl implements IWxBuildingInfoService +public class WxBuildingInfoServiceImpl extends ServiceImpl implements IWxBuildingInfoService { @Autowired private WxBuildingInfoMapper wxBuildingInfoMapper; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WxLoginServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WxLoginServiceImpl.java index feaff89a..849db740 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WxLoginServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WxLoginServiceImpl.java @@ -289,7 +289,8 @@ public class WxLoginServiceImpl implements WxLoginService { //如果为空，则表示是新用户登录，将该用户写入信息 if(login==null){ login=new WxUser(); - login.setUserName(entity.getUsername()); + login.setUserName(entity.getNickname()); + login.setLoginName(entity.getUsername()); /* if(StringUtils.isEmpty(entity.getTelephone())){ login.setLoginName(entity.getLoginName()); }else { diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WxUserServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WxUserServiceImpl.java index 407afa9a..c0311696 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WxUserServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WxUserServiceImpl.java @@ -1,11 +1,13 @@ package com.ruoyi.system.service.impl; -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.ruoyi.system.mapper.WxUserMapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.system.domain.WxUser; +import com.ruoyi.system.mapper.WxUserMapper; import com.ruoyi.system.service.IWxUserService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; /** * 微信用户Service业务层处理 @@ -14,7 +16,7 @@ import com.ruoyi.system.service.IWxUserService; * @date 2022-08-30 */ @Service -public class WxUserServiceImpl implements IWxUserService +public class WxUserServiceImpl extends ServiceImpl implements IWxUserService { @Autowired private WxUserMapper wxUserMapper; diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/BuildingTeamRelMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/BuildingTeamRelMapper.xml index dfb29a7b..d0d2c843 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/BuildingTeamRelMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/BuildingTeamRelMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -19,7 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select ID, IS_DELETED, CREATED_TIME, CREATED_BY, MODIFIED_BY, LAST_UPDATED_TIME, BUILDING_ID, TEAM_ID from building_team_rel - and IS_DELETED = #{isDeleted} @@ -37,7 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where ID = #{id} - + insert into building_team_rel IS_DELETED, @@ -59,7 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + update building_team_rel IS_DELETED = #{isDeleted}, diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CameraInfoMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CameraInfoMapper.xml index 59f47dfd..fb858cb8 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CameraInfoMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CameraInfoMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -25,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select ID, IS_DELETED, CREATED_TIME, CREATED_BY, MODIFIED_BY, LAST_UPDATED_TIME, STATUS, CITY_CODE, TYPE, NAME, SN, BUILDING_ID, REMARK, URL from camera_info - and IS_DELETED = #{isDeleted} @@ -49,7 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where ID = #{id} - + insert into camera_info IS_DELETED, @@ -83,7 +83,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + update camera_info IS_DELETED = #{isDeleted}, diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionMapper.xml index 2e0520d1..3be59e9a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -46,13 +46,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - select id, main_team_id, main_team_name, guest_team_id, guest_team_name, competition_code, competition_name, designated, competition_type, competition_time, building_id, building_name, competition_address, founder, status, city_code, city_name, max_player, created_time, last_updated_time, created_by, modified_by, is_deleted, longitude, latitude, remark, competition_nature, enroll_begin_time, enroll_end_time, contacts, contacts_area_code, contacts_tel, competition_begin_time, competition_end_time, organizer, undertake, competition_back_img, created_id, audit_status, height_hide, sponsor from competition + select id, main_team_id, main_team_name,order_id, guest_team_id, guest_team_name, competition_code, competition_name, designated, competition_type, competition_time, building_id, building_name, competition_address, founder, status, city_code, city_name, max_player, created_time, last_updated_time, created_by, modified_by, is_deleted, longitude, latitude, remark, competition_nature, enroll_begin_time, enroll_end_time, contacts, contacts_area_code, contacts_tel, competition_begin_time, competition_end_time, organizer, undertake, competition_back_img, created_id, audit_status, height_hide, sponsor from competition - and main_team_id = #{mainTeamId} @@ -265,7 +266,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + insert into competition main_team_id, @@ -308,6 +309,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" audit_status, height_hide, sponsor, + order_id, #{mainTeamId}, @@ -350,10 +352,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{auditStatus}, #{heightHide}, #{sponsor}, + #{orderId}, - + update competition main_team_id = #{mainTeamId}, @@ -396,6 +399,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" audit_status = #{auditStatus}, height_hide = #{heightHide}, sponsor = #{sponsor}, + order_id = #{orderId}, where id = #{id} diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionMembersMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionMembersMapper.xml index b119d982..d245d984 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionMembersMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionMembersMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -38,13 +38,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - select id, user_id, role_code, competition_id, competition_team_id, score, penalty, two_points, three_points, breaks, rebound, block, is_deleted, created_by, modified_by, created_time, last_updated_time, status, user_type, competition_of_team_id, competition_nature, real_name, jersey_number, id_type, id_card_no, contacts_tel, contacts, contacts_area_code, personal_photo, is_first_launch,team_position,height,weight from competition_members + select id, user_id, role_code,is_hide_avatar, competition_id, competition_team_id, score, penalty, two_points, three_points, breaks, rebound, block, is_deleted, created_by, modified_by, created_time, last_updated_time, status, user_type, competition_of_team_id, competition_nature, real_name, jersey_number, id_type, id_card_no, contacts_tel, contacts, contacts_area_code, personal_photo, is_first_launch,team_position,height,weight from competition_members - and user_id = #{userId} @@ -77,6 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and personal_photo = #{personalPhoto} and is_first_launch = #{isFirstLaunch} and team_position = #{teamPosition} + and is_hide_avatar = #{isHideAvatar} @@ -158,7 +160,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where c.competition_id = #{competitionId} AND c.is_deleted = 0 - + insert into competition_members user_id, @@ -193,6 +195,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" team_position, height, weight, + is_hide_avatar, #{userId}, @@ -227,10 +230,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{teamPosition}, #{height}, #{weight}, + #{isHideAvatar}, - + update competition_members user_id = #{userId}, @@ -265,6 +269,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" team_position = #{teamPosition}, height = #{height}, weight = #{weight}, + is_hide_avatar = #{isHideAvatar}, where id = #{id} diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionMembersScoreMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionMembersScoreMapper.xml index f0c436ea..b3c18314 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionMembersScoreMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionMembersScoreMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -40,7 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select id, competition_id, competition_vs_id, team_id, team_name, node_num, team_user_id, jersey_number, total_score, two_points, three_points, penalty, backboard, front_plate, back_plate, assists, snatch, block, fault, breaks, created_time, last_updated_time, created_by, modified_by, is_deleted, remark, is_first_launch,competition_of_team_id,competition_members_id from competition_members_score - and competition_id = #{competitionId} @@ -104,19 +104,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" sco.block, sco.fault, sco.breaks, - IFNULL( sco.is_first_launch, 0 ) AS isFirstLaunch + IFNULL( sco.is_first_launch, 0 ) AS isFirstLaunch, + if(team.is_hide_avatar,team.is_hide_avatar,member.is_hide_avatar) as isHideAvatar FROM competition_team_vs_team vs - INNER JOIN competition_of_team team ON ( vs.main_team_id = team.id OR vs.guest_team_id = team.id ) + INNER JOIN competition_of_team team ON ( vs.main_team_id = team.id OR vs.guest_team_id = team.id ) and team.competition_id = vs.competition_id AND team.IS_DELETED = 0 - LEFT JOIN competition_members member ON team.id = member.competition_of_team_id + LEFT JOIN competition_members member ON team.id = member.competition_of_team_id and team.competition_id = member.competition_id AND member.IS_DELETED = 0 - LEFT JOIN competition_members_score sco ON ( vs.id = sco.competition_vs_id AND member.id = sco.competition_members_id ) + LEFT JOIN competition_members_score sco ON ( vs.id = sco.competition_vs_id AND member.id = sco.competition_members_id ) and sco.competition_id = vs.competition_id AND sco.is_deleted = 0 - LEFT JOIN user_info userInfo ON member.user_id = userInfo.id - AND userInfo.is_deleted = 0 - LEFT JOIN competition_members cm ON cm.user_id = userInfo.id - AND cm.is_deleted = 0 WHERE 1 = 1 AND vs.is_deleted = 0 AND vs.competition_Id = #{competitionId} @@ -126,11 +123,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ORDER BY sco.is_first_launch desc - SELECT - t.competition_vs_id as competitionVsId, - count(1) as sessions, - sum(t.total_score ) /count(1) AS totalScore, + count(1) as totalCount, + sum(t.total_score ) /count(1) AS avgCountScore, + sum(t.total_score ) AS totalScore, sum(t.two_points) /count(1) as twoPoints, sum(t.three_points)/count(1) as threePoints, sum(t.penalty)/count(1) as penalty, @@ -147,7 +144,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" WHERE t.team_user_id = #{teamUserId} GROUP BY - t.competition_vs_id + t.team_user_id - + + insert into competition_members_score competition_id, @@ -244,7 +271,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + update competition_members_score competition_id = #{competitionId}, diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionOfTeamMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionOfTeamMapper.xml index 1fd75233..aeb30d2b 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionOfTeamMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionOfTeamMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -23,10 +23,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - select id, competition_id, team_id, team_name, competition_group, created_time, status, last_updated_time, created_by, modified_by, is_deleted, remark, contacts, contacts_tel, contacts_area_code, serial_number,team_logo,captain from competition_of_team + select id, competition_id, team_id,is_hide_avatar, team_name, competition_group, created_time, status, last_updated_time, created_by, modified_by, is_deleted, remark, contacts, contacts_tel, contacts_area_code, serial_number,team_logo,captain from competition_of_team - + insert into competition_of_team competition_id, @@ -231,6 +232,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" serial_number, team_logo, captain, + is_hide_avatar, #{competitionId}, @@ -250,10 +252,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{serialNumber}, #{teamLogo}, #{captain}, + #{isHideAvatar}, - + update competition_of_team competition_id = #{competitionId}, @@ -273,6 +276,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" serial_number = #{serialNumber}, team_logo = #{teamLogo}, captain = #{captain}, + is_hide_avatar = #{isHideAvatar}, where id = #{id} diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionResultMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionResultMapper.xml index ac018676..a55eb6bb 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionResultMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionResultMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -28,13 +28,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - select id, competition_id, competition_vs_id, team_id, team_name, one_node_score, two_node_score, competition_group, status, created_time, last_updated_time, created_by, modified_by, is_deleted, remark, three_node_score, four_node_score, five_node_score, six_node_score, integral,vs_result,competition_of_team_id,vs_result from competition_result + select id, competition_id, competition_vs_id,net_win_point, team_id, team_name, one_node_score, two_node_score, competition_group, status, created_time, last_updated_time, created_by, modified_by, is_deleted, remark, three_node_score, four_node_score, five_node_score, six_node_score, integral,vs_result,competition_of_team_id,vs_result from competition_result - and competition_id = #{competitionId} @@ -81,7 +82,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" rs.six_node_score as sixNodeScore, rs.vs_result, vs.vs_type, - rs.integral + rs.integral, + rs.net_win_point from competition_team_vs_team vs inner join competition_of_team team on (vs.main_team_id=team.id or vs.guest_team_id=team.id) and team.IS_DELETED=0 left join competition_Result rs on (rs.competition_vs_id=vs.id and team.id = rs.competition_of_team_id) and rs.is_deleted=0 @@ -94,7 +96,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + insert into competition_result competition_id, @@ -119,6 +121,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" vs_result, vs_type, competition_of_team_id, + net_win_point, #{competitionId}, @@ -143,10 +146,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{vsResult}, #{vsType}, #{competitionOfTeamId}, + #{netWinPoint}, - + update competition_result competition_id = #{competitionId}, @@ -171,6 +175,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" vs_result = #{vsResult}, vs_type = #{vsType}, competition_of_team_id = #{competitionOfTeamId}, + net_win_point = #{netWinPoint}, where id = #{id} diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionSharePermissionsMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionSharePermissionsMapper.xml index 1dbd9cc7..57794c61 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionSharePermissionsMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionSharePermissionsMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -24,7 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select id, create_time, competition_id, user_id, user_tel, user_name, status, update_time, create_by, update_by, is_deleted, remark, can_set_type from competition_share_permissions - and competition_id = #{competitionId} @@ -42,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} - + insert into competition_share_permissions create_time, @@ -74,7 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + update competition_share_permissions create_time = #{createTime}, diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionTeamGroupMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionTeamGroupMapper.xml index bb5b2b0b..07e5d8da 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionTeamGroupMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionTeamGroupMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -22,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select id, competition_id, competition_group, created_time, status, last_updated_time, created_by, modified_by, is_deleted, remark, is_cycle from competition_team_group - and competition_id = #{competitionId} @@ -61,7 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by t.created_time desc - + insert into competition_team_group competition_id, @@ -89,7 +89,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + update competition_team_group competition_id = #{competitionId}, diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionTeamVsTeamMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionTeamVsTeamMapper.xml index e86eb5fc..1331a72b 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionTeamVsTeamMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionTeamVsTeamMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -246,7 +246,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" sum(IF( t.vs_result = 'win', 1, 0 )) AS win, sum(IF( t.vs_result = 'fail', 1, 0 )) AS fail, sum(IFNULL( t.one_node_score, 0 )+ IFNULL( t.two_node_score, 0 )+ IFNULL( t.three_node_score, 0 )+ IFNULL( t.four_node_score, 0 )+ IFNULL( t.five_node_score, 0 )+ IFNULL( t.six_node_score, 0 )) AS totalScore, - sum(t.integral) AS integral + sum(ifnull(t.integral,0)) AS integral , + sum(IFNULL(t.net_win_point,0)) as netWinPoint FROM competition_result t left join competition_of_team team on team.id = t.competition_of_team_id WHERE t.is_deleted = 0 AND t.competition_id = #{competitionId} @@ -256,7 +257,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND t.competition_group =#{competitionGroup} GROUP BY t.competition_of_team_id - ORDER BY sum(t.integral) desc + ORDER BY sum(t.integral) desc,sum(IFNULL(t.net_win_point,0)) desc - + insert into competition_team_vs_team competition_id, @@ -403,7 +404,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + update competition_team_vs_team competition_id = #{competitionId}, diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CustomerMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CustomerMapper.xml index 0916b6d5..0cee7597 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CustomerMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CustomerMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -42,22 +42,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + - - @@ -65,34 +63,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - + + + insert into f_customer user_name, @@ -220,7 +257,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + update f_customer user_name = #{userName}, diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CustomerOrderMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CustomerOrderMapper.xml new file mode 100644 index 00000000..40430643 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CustomerOrderMapper.xml @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + select id, customer_id, order_date, car_info, car_vin,out_date, car_status, create_by, create_time, update_by, update_time, remark from f_customer_order + + + + + + + + + insert into f_customer_order + + customer_id, + order_date, + out_date, + car_info, + car_vin, + car_status, + create_by, + create_time, + update_by, + update_time, + remark, + + + #{customerId}, + #{orderDate}, + #{outDate}, + #{carInfo}, + #{carVin}, + #{carStatus}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{remark}, + + + + + update f_customer_order + + customer_id = #{customerId}, + order_date = #{orderDate}, + out_date = #{outDate}, + car_info = #{carInfo}, + car_vin = #{carVin}, + car_status = #{carStatus}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + remark = #{remark}, + + where id = #{id} + + + + delete from f_customer_order where id = #{id} + + + + delete from f_customer_order where id in + + #{id} + + + \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/DataDictionaryMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/DataDictionaryMapper.xml index 70defa78..43776399 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/DataDictionaryMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/DataDictionaryMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -22,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select ID, CREATED_BY, CREATED_TIME, MODIFIED_BY, LAST_UPDATED_TIME, IS_DELETED, KEY, NAME, ENABLED, PARENT_ID, SORT_NUMBER from data_dictionary - and CREATED_BY = #{createdBy} @@ -43,7 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where ID = #{id} - + insert into data_dictionary CREATED_BY, @@ -71,7 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + update data_dictionary CREATED_BY = #{createdBy}, diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/FeatureLabelMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/FeatureLabelMapper.xml index 38135d09..c2c6cad3 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/FeatureLabelMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/FeatureLabelMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select ID, IS_DELETED, CREATED_TIME, CREATED_BY, MODIFIED_BY, LAST_UPDATED_TIME, DESCRIPTION, REMARK, BUILDING_ID from feature_label - and IS_DELETED = #{isDeleted} @@ -39,7 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where ID = #{id} - + insert into feature_label IS_DELETED, @@ -63,7 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + update feature_label IS_DELETED = #{isDeleted}, diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/FollowUpMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/FollowUpMapper.xml index eb060693..127c8789 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/FollowUpMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/FollowUpMapper.xml @@ -3,102 +3,134 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - + + + + + - + + + - - - + + + + + - select id, customer_id, follow_up_date, follow_up_record, pre_to_store_date, create_by, create_time, update_by, update_time, remark, follow_level,follow_result,follow_up_method from f_follow_up + select id, customer_id,objective,follow_type,maker_status,arrival_time, follow_up_date, follow_up_method, follow_result, intention_level, follow_up_record, next_follow_up_record, next_follow_up_time, appointment_time, create_by, create_time, update_by, update_time, remark, defeat_reasons from f_follow_up - - - and customer_id = #{customerId} - and follow_result = #{followResult} - and follow_up_method = #{followUpMethod} + + and customer_id = #{customerId} and follow_up_date = #{followUpDate} + and follow_type = #{followType} + and follow_up_method = #{followUpMethod} + and follow_result = #{followResult} + and intention_level = #{intentionLevel} and follow_up_record = #{followUpRecord} - and pre_to_store_date = #{preToStoreDate} - and follow_level = #{followLevel} + and next_follow_up_record = #{nextFollowUpRecord} + and next_follow_up_time = #{nextFollowUpTime} + and appointment_time = #{appointmentTime} + and defeat_reasons = #{defeatReasons} - - where id = #{id} - - + + insert into f_follow_up customer_id, + maker_status, + follow_type, + arrival_time, follow_up_date, + follow_up_method, + follow_result, + intention_level, follow_up_record, - pre_to_store_date, + next_follow_up_record, + next_follow_up_time, + appointment_time, create_by, create_time, update_by, update_time, remark, - follow_level, - follow_result , - follow_up_method , - + defeat_reasons, + objective, + #{customerId}, + #{makerStatus}, + #{followType}, + #{arrivalTime}, #{followUpDate}, + #{followUpMethod}, + #{followResult}, + #{intentionLevel}, #{followUpRecord}, - #{preToStoreDate}, + #{nextFollowUpRecord}, + #{nextFollowUpTime}, + #{appointmentTime}, #{createBy}, #{createTime}, #{updateBy}, #{updateTime}, #{remark}, - #{followLevel}, - #{followResult}, - #{followUpMethod}, - + #{defeatReasons}, + #{objective}, + - + update f_follow_up customer_id = #{customerId}, + maker_status = #{makerStatus}, + follow_type = #{followType}, + arrival_time = #{arrivalTime}, follow_up_date = #{followUpDate}, + follow_up_method = #{followUpMethod}, + follow_result = #{followResult}, + intention_level = #{intentionLevel}, follow_up_record = #{followUpRecord}, - pre_to_store_date = #{preToStoreDate}, + next_follow_up_record = #{nextFollowUpRecord}, + next_follow_up_time = #{nextFollowUpTime}, + appointment_time = #{appointmentTime}, create_by = #{createBy}, create_time = #{createTime}, update_by = #{updateBy}, update_time = #{updateTime}, remark = #{remark}, - follow_level = #{followLevel}, - follow_result = #{followResult}, - follow_up_method = #{followUpMethod}, + defeat_reasons = #{defeatReasons}, + objective = #{objective}, where id = #{id} - + delete from f_follow_up where id = #{id} - delete from f_follow_up where id in + delete from f_follow_up where id in #{id} diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/GlobalAttachmentMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/GlobalAttachmentMapper.xml index 58329e2d..1d394638 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/GlobalAttachmentMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/GlobalAttachmentMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -24,7 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select ID, BIZ_TYPE, BIZ_ID, ATTACHMENT_NAME, ATTACHMENT_TYPE, ATTACHMENT_URL, VERSION, IS_DELETED, CREATED_TIME, CREATED_BY, MODIFIED_BY, LAST_UPDATED_TIME, consult_type from global_attachment - and BIZ_TYPE = #{bizType} @@ -47,7 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where ID = #{id} - + insert into global_attachment BIZ_TYPE, @@ -79,7 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + update global_attachment BIZ_TYPE = #{bizType}, diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/GroupWechatMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/GroupWechatMapper.xml index 0e143ac6..eb6df182 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/GroupWechatMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/GroupWechatMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -25,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select ID, BUILDING_ID, GROUP_NAME, HEADER_PICTURE, GROUP_CODE, SCAN_NUM, SERVICE_USER, SERVICE_USER_QRCODE, REMARKS, IS_DELETED, CREATED_TIME, CREATED_BY, MODIFIED_BY, LAST_UPDATED_TIME from group_wechat - and BUILDING_ID = #{buildingId} @@ -49,7 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where ID = #{id} - + insert into group_wechat BUILDING_ID, @@ -83,7 +83,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + update group_wechat BUILDING_ID = #{buildingId}, diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/MessageMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/MessageMapper.xml index c9c81383..09a7936c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/MessageMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/MessageMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -25,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select ID, CREATED_BY, CREATED_TIME, MODIFIED_BY, LAST_UPDATED_TIME, IS_DELETED, MESSAGE_TITLE, MESSAGE_TYPE, FLOW_TYPE, AUDITOR, AUDIT_DATE, SOURCE_ID, AGREE_FLAG, FLOW_ENTITY from message - and CREATED_BY = #{createdBy} @@ -49,7 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where ID = #{id} - + insert into message CREATED_BY, @@ -83,7 +83,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + update message CREATED_BY = #{createdBy}, diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/ShAreaMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/ShAreaMapper.xml index f4562a03..b7197e03 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/ShAreaMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/ShAreaMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -28,7 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select id, pid, shortname, cityName, merger_name, level, pinyin, code, zip_code, first, longitude, latitude, IS_DELETED, CREATED_TIME, CREATED_BY, MODIFIED_BY, LAST_UPDATED_TIME from sh_area - and pid = #{pid} @@ -68,7 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ORDER BY distance LIMIT 1 - + insert into sh_area pid, @@ -108,7 +108,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + update sh_area pid = #{pid}, diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml index b1570e28..31576f42 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -33,12 +33,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - @@ -64,7 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where config_key = #{configKey} limit 1 - + insert into sys_config ( config_name, config_key, @@ -84,7 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ) - + update sys_config config_name = #{configName}, diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml index 000166ed..ec9efa39 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -27,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from sys_dept d - where d.del_flag = '0' @@ -85,7 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where dept_name=#{deptName} and parent_id = #{parentId} and del_flag = '0' limit 1 - + insert into sys_dept( dept_id, parent_id, @@ -113,7 +113,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ) - + update sys_dept parent_id = #{parentId}, diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml index 75d80a15..b0eb6754 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -25,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from sys_dict_data - @@ -41,7 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by dict_sort asc - where status = '0' and dict_type = #{dictType} order by dict_sort asc @@ -71,7 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + update sys_dict_data dict_sort = #{dictSort}, @@ -93,7 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update sys_dict_data set dict_type = #{newDictType} where dict_type = #{oldDictType} - + insert into sys_dict_data( dict_sort, dict_label, diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml index 2b44b2ee..e5184908 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from sys_dict_type - @@ -71,7 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + update sys_dict_type dict_name = #{dictName}, @@ -84,7 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where dict_id = #{dictId} - + insert into sys_dict_type( dict_name, dict_type, diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml index 4f400694..20e1fdf2 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -13,12 +13,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + insert into sys_logininfor (user_name, status, ipaddr, msg, access_time) values (#{userName}, #{status}, #{ipaddr}, #{msg}, sysdate()) - select info_id, user_name, ipaddr, status, msg, access_time from sys_logininfor diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml index e90f6baf..88b33472 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -32,7 +32,7 @@ from sys_menu - @@ -54,7 +54,7 @@ order by m.parent_id, m.order_num - select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time from sys_menu m left join sys_role_menu rm on m.menu_id = rm.menu_id @@ -127,12 +127,12 @@ select count(1) from sys_menu where parent_id = #{menuId} - where menu_name=#{menuName} and parent_id = #{parentId} limit 1 - + update sys_menu menu_name = #{menuName}, @@ -155,7 +155,7 @@ where menu_id = #{menuId} - + insert into sys_menu( menu_id, parent_id, diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml index 6915a148..b633cdc3 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -27,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where notice_id = #{noticeId} - @@ -42,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + insert into sys_notice ( notice_title, notice_type, @@ -62,7 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ) - + update sys_notice notice_title = #{noticeTitle}, diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml index 1d3d5aab..2bee6a56 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -27,12 +27,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from sys_oper_log - + insert into sys_oper_log(title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_param, json_result, status, error_msg, oper_time) values (#{title}, #{businessType}, #{method}, #{requestMethod}, #{operatorType}, #{operName}, #{deptName}, #{operUrl}, #{operIp}, #{operParam}, #{jsonResult}, #{status}, #{errorMsg}, sysdate()) - diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml index 2425ae05..4fc53076 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -22,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from sys_post - @@ -72,7 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where post_code=#{postCode} limit 1 - + update sys_post post_code = #{postCode}, @@ -86,7 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where post_id = #{postId} - + insert into sys_post( post_id, post_code, diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml index 700671e1..c2815f24 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml index 12e7f78e..e785119a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -30,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join sys_dept d on u.dept_id = d.dept_id - where r.del_flag = '0' @@ -93,7 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where r.role_key=#{roleKey} and r.del_flag = '0' limit 1 - + insert into sys_role( role_id, role_name, @@ -121,7 +121,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ) - + update sys_role role_name = #{roleName}, diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml index e75bb174..4cc2bef8 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml index 9f1839c1..ea73e2b9 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -23,11 +23,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + @@ -37,7 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -56,7 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join sys_role r on r.role_id = ur.role_id - select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u left join sys_dept d on u.dept_id = d.dept_id where u.del_flag = '0' @@ -85,7 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ${params.dataScope} - select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time from sys_user u left join sys_dept d on u.dept_id = d.dept_id @@ -102,7 +102,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ${params.dataScope} - select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time from sys_user u left join sys_dept d on u.dept_id = d.dept_id @@ -142,7 +142,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select user_id, email from sys_user where email = #{email} and del_flag = '0' limit 1 - + insert into sys_user( user_id, dept_id, @@ -174,7 +174,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ) - + update sys_user dept_id = #{deptId}, @@ -195,15 +195,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where user_id = #{userId} - + update sys_user set status = #{status} where user_id = #{userId} - + update sys_user set avatar = #{avatar} where user_name = #{userName} - + update sys_user set password = #{password} where user_name = #{userName} diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml index 21c40981..0ff0cb91 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml index 95e07adb..b210005d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -31,7 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + delete from sys_user_role where user_id=#{userId} and role_id=#{roleId} diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/TeamMembersMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/TeamMembersMapper.xml index 2ac16068..a3638641 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/TeamMembersMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/TeamMembersMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -62,7 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + insert into team_members team_id, @@ -94,7 +94,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + update team_members team_id = #{teamId}, diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/TokenInfoMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/TokenInfoMapper.xml index b23d5396..6b9aa6c6 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/TokenInfoMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/TokenInfoMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -19,7 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select ID, IS_DELETED, CREATED_TIME, CREATED_BY, MODIFIED_BY, LAST_UPDATED_TIME, MAIN_TOKEN, KIK_TOKEN from token_info - and IS_DELETED = #{isDeleted} @@ -37,7 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where ID = #{id} - + insert into token_info IS_DELETED, @@ -59,7 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + update token_info IS_DELETED = #{isDeleted}, diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/TrainingInfoMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/TrainingInfoMapper.xml index 014a63a7..0d6af41a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/TrainingInfoMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/TrainingInfoMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -24,7 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select ID, IS_DELETED, CREATED_TIME, CREATED_BY, MODIFIED_BY, LAST_UPDATED_TIME, TRAIN_NAME, PHONE, LINKMAN, TRAIN_DESC, BUILD_ID, DEFAULT_PICTURE, PRICE from training_info - and IS_DELETED = #{isDeleted} @@ -47,7 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where ID = #{id} - + insert into training_info IS_DELETED, @@ -79,7 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + update training_info IS_DELETED = #{isDeleted}, diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/UserBuildingRelMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/UserBuildingRelMapper.xml index 8ab86831..85d35b12 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/UserBuildingRelMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/UserBuildingRelMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -19,7 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select ID, IS_DELETED, CREATED_TIME, CREATED_BY, MODIFIED_BY, LAST_UPDATED_TIME, USER_CODE, BUILDING_ID from user_building_rel - and IS_DELETED = #{isDeleted} @@ -37,7 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where ID = #{id} - + insert into user_building_rel ID, @@ -61,7 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + update user_building_rel IS_DELETED = #{isDeleted}, diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/UserRoleMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/UserRoleMapper.xml index 656f3bbb..2a997bc6 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/UserRoleMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/UserRoleMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select ID, USER_ID, ROLE_CODE, CREATED_TIME, CREATED_BY, MODIFIED_BY, IS_DELETED, LAST_UPDATED_TIME, ROLE_ID from user_role - and USER_ID = #{userId} @@ -45,7 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select * from user_role where USER_ID = #{userId} - + insert into user_role USER_ID, @@ -69,7 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + update user_role USER_ID = #{userId}, diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/UserWxAqrCodeMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/UserWxAqrCodeMapper.xml index 64251705..c1967546 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/UserWxAqrCodeMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/UserWxAqrCodeMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -28,7 +28,7 @@ select ID, IS_DELETED, CREATED_TIME, CREATED_BY, MODIFIED_BY, LAST_UPDATED_TIME, scene, code_img_url, user_id, bus_type, page, width, use_desc, jersey_no, team_id,competition_of_team_id,competition_members_id from user_wx_aqr_code - and CREATED_BY like concat('%', #{createdBy}, '%') @@ -74,7 +74,7 @@ - + insert into user_wx_aqr_code IS_DELETED, @@ -114,7 +114,7 @@ - + update user_wx_aqr_code IS_DELETED = #{isDeleted}, diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/WxBasketballTeamMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/WxBasketballTeamMapper.xml index 7c4d7f39..5ef04ba6 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/WxBasketballTeamMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/WxBasketballTeamMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -26,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select ID, IS_DELETED, CREATED_TIME, CREATED_BY, MODIFIED_BY, LAST_UPDATED_TIME, TEAM_NAME, TEAM_DES, REMARK, BUILD_ID, DEFAULT_PICTURE, BUILDING_NAME, CREATED_ID, CONTACT_TEL, team_logo from basketball_team - and TEAM_NAME like concat('%', #{teamName}, '%') @@ -60,7 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by t.created_time desc - + insert into basketball_team IS_DELETED, @@ -96,7 +96,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + update basketball_team IS_DELETED = #{isDeleted}, diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/WxBuildingInfoMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/WxBuildingInfoMapper.xml index 10700320..68d87f27 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/WxBuildingInfoMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/WxBuildingInfoMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -35,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select ID, IS_DELETED, CREATED_TIME, CREATED_BY, MODIFIED_BY, LAST_UPDATED_TIME, BUILDING_NAME, ADDRESS, LONGITUDE, LATITUDE, PROVINCE_CODE, CITY_CODE, COUNTY_CODE, REMARK, CITY_NAME, DEFAULT_PICTURE, IS_SUPPORTLIVE, STATUS, REJECT_REASON, IS_OPEN, MITTELKURS, CHAT_GROUP_URL, CREATED_ID from building_info - and ID = #{id} @@ -135,7 +135,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + insert into building_info IS_DELETED, @@ -189,7 +189,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + update building_info IS_DELETED = #{isDeleted}, diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/WxUserMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/WxUserMapper.xml index 726c1a8a..b34889d2 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/WxUserMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/WxUserMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -34,7 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select ID, IS_DELETED, CREATED_TIME, CREATED_BY, MODIFIED_BY, LAST_UPDATED_TIME, LOGIN_NAME, PASS_WORD, ROLE, OPENID, AVATAR, GENDER, USER_NAME, TELEPHONE, BIRTHDAY, HEIGHT, WEIGHT, TEAM_POSITION, TAG, ENABLED, UNIONID, OFFICIAL_ACCOUNT_OPENID,REAL_NAME from user_info - and IS_DELETED = #{isDeleted} @@ -104,7 +104,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" limit 1 - + insert into user_info IS_DELETED, @@ -156,7 +156,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + update user_info IS_DELETED = #{isDeleted}, diff --git a/ruoyi-ui/src/api/system/customer.js b/ruoyi-ui/src/api/system/customer.js index 1a7dfd47..ab391dbd 100644 --- a/ruoyi-ui/src/api/system/customer.js +++ b/ruoyi-ui/src/api/system/customer.js @@ -8,6 +8,14 @@ export function listCustomer(query) { params: query }) } +// 查询客户预约信息列表 +export function listCustomerMaker(query) { + return request({ + url: '/system/customer/makerList', + method: 'get', + params: query + }) +} // 查询客户信息列表 export function listCustomerFollow(query) { return request({ @@ -49,7 +57,13 @@ export function addCustomerFollowRecerd(data) { data: data }) } - +export function addCustomerOrderRecerd(data){ + return request({ + url: '/system/customerOrder', + method: 'post', + data: data + }) +} export function updateCustomerFollowRecerd(data) { return request({ url: '/system/up', @@ -57,6 +71,14 @@ export function updateCustomerFollowRecerd(data) { data: data }) } +//确认到店 +export function confirmToStore(data) { + return request({ + url: '/system/up', + method: 'put', + data: data + }) +} // 删除客户信息 export function delCustomer(id) { return request({ diff --git a/ruoyi-ui/src/api/system/customerOrder.js b/ruoyi-ui/src/api/system/customerOrder.js new file mode 100644 index 00000000..e0cd19c0 --- /dev/null +++ b/ruoyi-ui/src/api/system/customerOrder.js @@ -0,0 +1,58 @@ +import request from '@/utils/request' + +// 查询客户-订车列表 +export function listCustomerOrder(query) { + return request({ + url: '/system/customerOrder/list', + method: 'get', + params: query + }) +} +// 查询客户-订车列表 +export function getCustomerOrderPage(query) { + return request({ + url: '/system/customerOrder/getCustomerOrderPage', + method: 'get', + params: query + }) +} +export function confirmToOut(data){ + return request({ + url: '/system/customerOrder', + method: 'put', + data: data + }) +} +// 查询客户-订车详细 +export function getCustomerOrder(id) { + return request({ + url: '/system/customerOrder/' + id, + method: 'get' + }) +} + +// 新增客户-订车 +export function addCustomerOrder(data) { + return request({ + url: '/system/customerOrder', + method: 'post', + data: data + }) +} + +// 修改客户-订车 +export function updateCustomerOrder(data) { + return request({ + url: '/system/customerOrder', + method: 'put', + data: data + }) +} + +// 删除客户-订车 +export function delCustomerOrder(id) { + return request({ + url: '/system/customerOrder/' + id, + method: 'delete' + }) +} diff --git a/ruoyi-ui/src/layout/components/Navbar.vue b/ruoyi-ui/src/layout/components/Navbar.vue index eabb5666..d9fb65c0 100644 --- a/ruoyi-ui/src/layout/components/Navbar.vue +++ b/ruoyi-ui/src/layout/components/Navbar.vue @@ -102,7 +102,7 @@ export default { type: 'warning' }).then(() => { this.$store.dispatch('LogOut').then(() => { - location.href = process.env.ENV_NG+'index'; + location.href = '/prod/index'; }) }).catch(() => {}); } diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js index 8ed5094a..d67881d9 100644 --- a/ruoyi-ui/src/router/index.js +++ b/ruoyi-ui/src/router/index.js @@ -186,7 +186,7 @@ Router.prototype.push = function push(location) { export default new Router({ mode: 'history', // 去掉url中的# - base: process.env.ENV_NG, + base: "/prod/", scrollBehavior: () => ({ y: 0 }), routes: constantRoutes }) diff --git a/ruoyi-ui/src/utils/dict/Dict.js b/ruoyi-ui/src/utils/dict/Dict.js index 22db32fe..cddd4bbd 100644 --- a/ruoyi-ui/src/utils/dict/Dict.js +++ b/ruoyi-ui/src/utils/dict/Dict.js @@ -1,82 +1,91 @@ -import Vue from 'vue' -import { mergeRecursive } from "@/utils/ruoyi"; -import DictMeta from './DictMeta' -import DictData from './DictData' - -const DEFAULT_DICT_OPTIONS = { - types: [], -} - -/** - * @classdesc 字典 - * @property {Object} label 标签对象，内部属性名为字典类型名称 - * @property {Object} dict 字段数组，内部属性名为字典类型名称 - * @property {Array.} _dictMetas 字典元数据数组 - */ -export default class Dict { - constructor() { - this.owner = null - this.label = {} - this.type = {} - } - - init(options) { - if (options instanceof Array) { - options = { types: options } - } - const opts = mergeRecursive(DEFAULT_DICT_OPTIONS, options) - if (opts.types === undefined) { - throw new Error('need dict types') - } - const ps = [] - this._dictMetas = opts.types.map(t => DictMeta.parse(t)) - this._dictMetas.forEach(dictMeta => { - const type = dictMeta.type - Vue.set(this.label, type, {}) - Vue.set(this.type, type, []) - if (dictMeta.lazy) { - return - } - ps.push(loadDict(this, dictMeta)) - }) - return Promise.all(ps) - } - - /** - * 重新加载字典 - * @param {String} type 字典类型 - */ - reloadDict(type) { - const dictMeta = this._dictMetas.find(e => e.type === type) - if (dictMeta === undefined) { - return Promise.reject(`the dict meta of ${type} was not found`) - } - return loadDict(this, dictMeta) - } -} - -/** - * 加载字典 - * @param {Dict} dict 字典 - * @param {DictMeta} dictMeta 字典元数据 - * @returns {Promise} - */ -function loadDict(dict, dictMeta) { - return dictMeta.request(dictMeta) - .then(response => { - const type = dictMeta.type - let dicts = dictMeta.responseConverter(response, dictMeta) - if (!(dicts instanceof Array)) { - console.error('the return of responseConverter must be Array.') - dicts = [] - } else if (dicts.filter(d => d instanceof DictData).length !== dicts.length) { - console.error('the type of elements in dicts must be DictData') - dicts = [] - } - dict.type[type].splice(0, Number.MAX_SAFE_INTEGER, ...dicts) - dicts.forEach(d => { - Vue.set(dict.label[type], d.value, d.label) - }) - return dicts - }) -} +import Vue from 'vue' +import { mergeRecursive } from "@/utils/ruoyi"; +import DictMeta from './DictMeta' +import DictData from './DictData' + +const DEFAULT_DICT_OPTIONS = { + types: [], +} +//字典翻译 +export function translateDict(list, e){ + var value = '' + list.map(i =>{ + if (i.code ==e) { + value =i.value + } + }) + return value +} +/** + * @classdesc 字典 + * @property {Object} label 标签对象，内部属性名为字典类型名称 + * @property {Object} dict 字段数组，内部属性名为字典类型名称 + * @property {Array.} _dictMetas 字典元数据数组 + */ +export default class Dict { + constructor() { + this.owner = null + this.label = {} + this.type = {} + } + + init(options) { + if (options instanceof Array) { + options = { types: options } + } + const opts = mergeRecursive(DEFAULT_DICT_OPTIONS, options) + if (opts.types === undefined) { + throw new Error('need dict types') + } + const ps = [] + this._dictMetas = opts.types.map(t => DictMeta.parse(t)) + this._dictMetas.forEach(dictMeta => { + const type = dictMeta.type + Vue.set(this.label, type, {}) + Vue.set(this.type, type, []) + if (dictMeta.lazy) { + return + } + ps.push(loadDict(this, dictMeta)) + }) + return Promise.all(ps) + } + + /** + * 重新加载字典 + * @param {String} type 字典类型 + */ + reloadDict(type) { + const dictMeta = this._dictMetas.find(e => e.type === type) + if (dictMeta === undefined) { + return Promise.reject(`the dict meta of ${type} was not found`) + } + return loadDict(this, dictMeta) + } +} + +/** + * 加载字典 + * @param {Dict} dict 字典 + * @param {DictMeta} dictMeta 字典元数据 + * @returns {Promise} + */ +function loadDict(dict, dictMeta) { + return dictMeta.request(dictMeta) + .then(response => { + const type = dictMeta.type + let dicts = dictMeta.responseConverter(response, dictMeta) + if (!(dicts instanceof Array)) { + console.error('the return of responseConverter must be Array.') + dicts = [] + } else if (dicts.filter(d => d instanceof DictData).length !== dicts.length) { + console.error('the type of elements in dicts must be DictData') + dicts = [] + } + dict.type[type].splice(0, Number.MAX_SAFE_INTEGER, ...dicts) + dicts.forEach(d => { + Vue.set(dict.label[type], d.value, d.label) + }) + return dicts + }) +} diff --git a/ruoyi-ui/src/views/system/WxBuilding/index.vue b/ruoyi-ui/src/views/system/WxBuilding/index.vue index ef746fcb..b830edd2 100644 --- a/ruoyi-ui/src/views/system/WxBuilding/index.vue +++ b/ruoyi-ui/src/views/system/WxBuilding/index.vue @@ -291,7 +291,7 @@ { this.form = response.data; + this.markers[0].position = [response.data.longitude, response.data.latitude] + this.center=[response.data.longitude, response.data.latitude]; this.open = true; this.imageUrl = this.form.chatGroupUrl; var defaultPictureKeys = Object.keys(response.data.defaultPicture); @@ -686,8 +688,7 @@ export default { this.fileList.push(imgItem); }); } - - this.title = "修改球场管理"; + this.title = "修改球场信息"; }); }, //限制上传文件的个数提示 diff --git a/ruoyi-ui/src/views/system/basketBallTeam/index.vue b/ruoyi-ui/src/views/system/basketBallTeam/index.vue index a13290ed..f13321e3 100644 --- a/ruoyi-ui/src/views/system/basketBallTeam/index.vue +++ b/ruoyi-ui/src/views/system/basketBallTeam/index.vue @@ -159,7 +159,7 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - 搜索 重置 @@ -96,7 +44,7 @@ - + - - - - + - - - - + - - + - - + - - - - - - - - - - - - - - - + @@ -348,14 +261,6 @@ placeholder="请选择预计到店"> - @@ -457,9 +362,10 @@ diff --git a/ruoyi-ui/src/views/system/potentialCustomer/index.vue b/ruoyi-ui/src/views/system/potentialCustomer/index.vue index 341a9bbd..93cf753a 100644 --- a/ruoyi-ui/src/views/system/potentialCustomer/index.vue +++ b/ruoyi-ui/src/views/system/potentialCustomer/index.vue @@ -9,7 +9,6 @@ @keyup.enter.native="handleQuery" /> - - - - - - - - - - - + - + + + + - - - - + - - - + - - - - - + + + + + @@ -207,6 +179,13 @@ @click="handleFollow(scope.row)" v-hasPermi="['system:customer:edit']" >跟进 + 下订单 - - + + - + @@ -379,19 +358,14 @@ -

跟进方式： - - - -

-

级别： {{follow.followLevel}}

-

记录： {{follow.followUpRecord}}

-

再次预约到店日期： {{follow.preToStoreDate}}

+

跟进方式: {{follow.followUpMethod}}

+

跟进结果: {{follow.followResultDesc}}

+

意向级别: {{follow.intentionLevel}}

+

跟进记录: {{follow.followUpRecord}}

+

预约时间: {{follow.appointmentTime}}

+

下次跟进时间: {{follow.nextFollowUpTime}}

+

下次跟进记录: {{follow.nextFollowUpRecord}}

+

战败原因: {{follow.defeatReasons}}

提交于 {{follow.createTime}}

 @@ -416,11 +390,39 @@ /> - + - - + + + {{ dict.label }} + + + + + + + + + + + + + + + + - - - + + @@ -446,8 +443,54 @@ 取 消 - + + + + + {{orderForm.customerName}} + + + + + + + + + + + + + + + + + + + + + + + + +
+ 确 定 + 取 消 +
+ @@ -458,13 +501,12 @@ import { delCustomer, addCustomer, updateCustomer, - addCustomerFollowRecerd, updateCustomerFollowRecerd, listCustomerFollow + addCustomerFollowRecerd, updateCustomerFollowRecerd, listCustomerFollow, addCustomerOrderRecerd } from "@/api/system/customer"; -import Data from "@/views/system/dict/data"; export default { name: "potentialCustomer", - dicts: ['to_store_status', 'customer_source','customer_status', 'sys_user_sex', 'customer_level', 'clue_channels','follow_result','follow_up_method'], + dicts: ['to_store_status','car_status' ,'customer_source','customer_status', 'sys_user_sex', 'customer_level', 'clue_channels','follow_result','follow_up_method'], data() { return { drawer:false, @@ -472,6 +514,7 @@ export default { innerDrawer:false, dafaultValue:null, customerId:null, + customerStatus:null, // 遮罩层 loading: true, followTitle:null, @@ -495,6 +538,23 @@ export default { title: "", // 是否显示弹出层 open: false, + orderOpen:false, + orderTitle:null, + orderForm:{}, + orderRules:{ + orderDate: [ + { required: true, message: "订单日期不能为空", trigger: "blur" } + ], + carInfo: [ + { required: true, message: "车辆信息不能为空", trigger: "blur" } + ], + carVin: [ + { required: true, message: "车辆VIN不能为空", trigger: "blur" } + ], + carStatus:[ + { required: true, message: "车辆状态不能为空", trigger: "change" } + ], + }, // 查询参数 queryParams: { pageNum: 1, @@ -507,7 +567,7 @@ export default { status: null, wechat: null, intentionCarModels: null, - preToStoreDate: null, + appointmentTime: null, orderDate: null }, // 表单参数 @@ -518,6 +578,13 @@ export default { followUpDate:null, customerId:null, }, + followFormShow:{ + appointmentTimeShow:false, + intentionLevelShow:false, + nextFollowUpTimeShow:false, + nextFollowUpRecordShow:false, + defeatReasonsShow:false, + }, // 表单校验 rules: { userName: [ @@ -544,7 +611,7 @@ export default { followUpRecord:[ { required: true, message: "跟进记录不能为空", trigger: "blur" } ], - followLevel: [ + intentionLevel: [ { required: true, message: "级别不能为空", trigger: "blur" } ], followUpMethod:[ @@ -556,39 +623,39 @@ export default { }, // 列表的列的显示隐藏设置 columns:[ - { key: 0, label: `客户ID`, visible: true }, + { key: 0, label: `客户ID`, visible: false }, { key: 1, label: `客户名`, visible: true }, - { key: 2, label: `客户昵称`, visible: true }, + { key: 2, label: `客户昵称`, visible: false }, { key: 3, label: `客户级别`, visible: true }, { key: 4, label: `用户邮箱`, visible: true }, { key: 5, label: `手机号码`, visible: true }, { key: 6, label: `客户性别`, visible: true }, - { key: 7, label: `头像地址`, visible: true }, - { key: 8, label: `线索渠道`, visible: true }, - { key: 9, label: `信息来源`, visible: true }, + { key: 7, label: `头像地址`, visible: false }, + { key: 8, label: `线索渠道`, visible: false }, + { key: 9, label: `信息来源`, visible: false }, { key: 10, label: `客户居住`, visible: true }, { key: 11, label: `到店状态`, visible: true }, - { key: 12, label: `删除标志`, visible: true }, - { key: 13, label: `最后登录IP`, visible: true }, - { key: 14, label: `最后登录时间`, visible: true }, - { key: 15, label: `创建者`, visible: true }, + { key: 12, label: `删除标志`, visible: false }, + { key: 13, label: `最后登录IP`, visible: false }, + { key: 14, label: `最后登录时间`, visible: false }, + { key: 15, label: `创建者`, visible: false }, { key: 16, label: `创建时间`, visible: true }, - { key: 17, label: `更新者`, visible: true }, + { key: 17, label: `更新者`, visible: false }, { key: 18, label: `更新时间`, visible: true }, - { key: 19, label: `备注`, visible: true }, + { key: 19, label: `备注`, visible: false }, { key: 20, label: `微信号`, visible: true }, - { key: 21, label: `购车类型`, visible: true }, - { key: 22, label: `已有车辆`, visible: true }, - { key: 23, label: `是否评估`, visible: true }, + { key: 21, label: `购车类型`, visible: false }, + { key: 22, label: `已有车辆`, visible: false }, + { key: 23, label: `是否评估`, visible: false }, { key: 24, label: `意向车型`, visible: true }, - { key: 25, label: `对比车型`, visible: true }, - { key: 26, label: `是否试驾`, visible: true }, - { key: 27, label: `是否报价`, visible: true }, - { key: 28, label: `是否金融`, visible: true }, - { key: 29, label: `未订车原因`, visible: true }, - { key: 30, label: `预计到店`, visible: true }, - { key: 31, label: `最后到店`, visible: true }, - { key: 32, label: `4S店`, visible: true }, + { key: 25, label: `对比车型`, visible: false }, + { key: 26, label: `是否试驾`, visible: false }, + { key: 27, label: `是否报价`, visible: false }, + { key: 28, label: `是否金融`, visible: false }, + { key: 29, label: `未订车原因`, visible: false }, + { key: 30, label: `预计到店`, visible: false }, + { key: 31, label: `最后到店`, visible: false }, + { key: 32, label: `4S店`, visible: false }, { key: 33, label: `下单日期`, visible: true }, { key: 34, label: `跟进次数`, visible: true }, { key: 35, label: `最新跟进日`, visible: true }, @@ -618,20 +685,52 @@ export default { this.loading = false; }); }, + tableRowClassName({row, rowIndex}) { + if (row.proposalNextFollowDate === '24小时内回访') { + return 'warning-row'; + } else if (this.getDateYYYYMMdd() > row.proposalNextFollowDate) { + return 'danger-row'; + }else { + // return 'success-row'; + } + return ''; + }, /** 查询客户跟进信息列表 */ getFollowList(customerId) { + let that = this; this.loading = true; let queryParams = { customerId:customerId, pageNum:1, pageSize:1000, + followType:'potential' } + let dictType = that.dict.type; listCustomerFollow(queryParams).then(response => { this.followUpList = response.rows; + //赋值 + for (let follow of this.followUpList) { + let followUpMethod = this.getDictLableByVal(dictType.follow_up_method,follow.followUpMethod); + let followResult = this.getDictLableByVal(dictType.follow_result,follow.followResult); + let intentionLevel = this.getDictLableByVal(dictType.customer_level,follow.intentionLevel); + follow.followUpMethod = followUpMethod; + follow.followResultDesc = followResult; + follow.intentionLevel = intentionLevel; + } this.total = response.total; this.loading = false; }); }, + //跟进字典val获取描述 + getDictLableByVal(dictData,val){ + let lable = ''; + dictData.map(i =>{ + if (i.value == val) { + lable = i.label + } + }) + return lable + }, // 取消按钮 cancel() { this.open = false; @@ -670,7 +769,7 @@ export default { isOffer: null, isFinance: null, unBookingCarReason: null, - preToStoreDate: null, + appointmentTime: null, lastToStoreDate: null, storeName: null, orderDate: null @@ -716,14 +815,54 @@ export default { handleFollow(row){ this.drawer = true; this.customerId = row.id; - this.followTitle = row.userName + " 跟进记录"; + this.customerStatus = row.status; + this.followTitle = row.userName +" "+ row.phoneNumber+" 跟进记录"; this.getFollowList(this.customerId); }, + //订车 + handleToOrder(row){ + this.orderForm.customerId = row.id; + this.orderForm.customerName = row.userName; + this.orderForm.carStatus = 'notOut'; + this.orderOpen = true; + this.orderTitle = "新增订单"; + }, + orderSubmitForm(){ + this.$refs["orderForm"].validate(valid => { + if (valid) { + addCustomerOrderRecerd(this.orderForm).then(response => { + this.$modal.msgSuccess("订单新增成功"); + this.orderOpen = false; + this.getList(this.customerId); + }); + } + }); + }, + orderCancel(){ + this.orderOpen = false; + this.orderForm = { }; + }, handleDrawerAddFollowUp(){ this.innerDrawer = true; this.followForm = {}; - this.followForm.followUpDate = new Date(); + this.followForm.followUpDate = this.getDateYYYYMMddHHMMSS(); this.followForm.customerId = this.customerId; + this.followForm.followType = this.customerStatus; + }, + getDateYYYYMMddHHMMSS(){ + const date = new Date(); + const month = (date.getMonth() + 1).toString().padStart(2, '0'); + const strDate = date.getDate().toString().padStart(2, '0'); + const starHours = date.getHours().toString().padStart(2, '0'); + const starMinutes = date.getMinutes().toString().padStart(2, '0'); + const starSeconds = date.getSeconds().toString().padStart(2, '0'); + return `${date.getFullYear()}-${month}-${strDate} ${starHours}:${starMinutes}:${starSeconds}`; + }, + getDateYYYYMMdd(){ + const date = new Date(); + const month = (date.getMonth() + 1).toString().padStart(2, '0'); + const strDate = date.getDate().toString().padStart(2, '0'); + return `${date.getFullYear()}-${month}-${strDate}`; }, /** 提交按钮 */ submitForm() { @@ -785,9 +924,9 @@ export default { let obj = {}; obj.followUpDate = ""; obj.followUpRecord = ""; - obj.preToStoreDate = ""; + obj.appointmentTime = ""; obj.remark = ""; - obj.followLevel = ""; + obj.intentionLevel = ""; this.followUpList.push(obj); }, /** 跟进模块-客户跟进记录删除按钮操作 */ @@ -802,6 +941,35 @@ export default { }); } }, + //新增跟进时，选择跟进结果实现不同表单校验 + selctRadion(e){ + if(e=='fail'){ + // this.followRules.defeatReasons = [{required: true, message: "战败原因不能为空", trigger: "blur"}] + this.followRules.intentionLevel = []; + this.followRules.nextFollowUpTime = []; + this.followFormShow.defeatReasonsShow = true; + this.followFormShow.appointmentTimeShow=false; + this.followFormShow.intentionLevelShow=false; + this.followFormShow.nextFollowUpTimeShow=false; + this.followFormShow.nextFollowUpRecordShow=false; + }else if(e=='going'){ + this.followRules.defeatReasons = []; + this.followRules.appointmentTime = []; + this.followFormShow.defeatReasonsShow = false; + this.followFormShow.appointmentTimeShow=false; + this.followFormShow.intentionLevelShow=true; + this.followFormShow.nextFollowUpTimeShow=true; + this.followFormShow.nextFollowUpRecordShow=true; + }else if(e=='maker'){ + this.followRules.defeatReasons = []; + this.followFormShow.defeatReasonsShow = false; + this.followFormShow.appointmentTimeShow=true; + this.followFormShow.intentionLevelShow=true; + this.followFormShow.nextFollowUpTimeShow=true; + this.followFormShow.nextFollowUpRecordShow=true; + this.followForm.makerStatus ="waitStore"; + } + }, /** 复选框选中数据 */ handleFollowUpSelectionChange(selection) { this.checkedFollowUp = selection.map(item => item.index) @@ -875,4 +1043,15 @@ export default { .login-code-img { height: 38px; } +.el-table .warning-row { + background: #E6A23C; +} + +.el-table .success-row { + background: #67C23A; +} + +.el-table .danger-row { + background: #F56C6C; +} diff --git a/ruoyi-ui/src/views/system/salesFollowUp/index.vue b/ruoyi-ui/src/views/system/salesFollowUp/index.vue index 1f110e72..1db59000 100644 --- a/ruoyi-ui/src/views/system/salesFollowUp/index.vue +++ b/ruoyi-ui/src/views/system/salesFollowUp/index.vue @@ -1,95 +1,46 @@