diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/controller/HighQualityClientController.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/controller/HighQualityClientController.java index cce16d9..c7de86b 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/controller/HighQualityClientController.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/controller/HighQualityClientController.java @@ -42,6 +42,10 @@ public class HighQualityClientController { private IUploadOssService iUploadOssService; @Resource private IHighQualityContactSuggestionService highQualityContactSuggestionService; + @Resource + private IHighQualityStudyService iHighQualityStudyService; + @Resource + private IHighQualityStudyProvincesService iHighQualityStudyProvincesService; @ApiOperation("右侧专业线数据") @GetMapping("/data/list") @@ -150,4 +154,30 @@ public class HighQualityClientController { return BaseResponse.success(highQualityContactSuggestionService.submitSuggestion(inVO)); } + /** + * 查询个人排行 + * + * @param + * + * @return + */ + @ApiOperation("查询个人排行") + @PostMapping("/getPersonScoreSort") + public BaseResponse> getPersonScoreSort(){ + return BaseResponse.success(iHighQualityStudyService.getPersonScoreSort()); + } + + /** + * 查询省分排行 + * + * @param + * + * @return + */ + @ApiOperation("查询省分排行") + @PostMapping("/getProvinceScoreSort") + public BaseResponse> getProvinceScoreSort(){ + return BaseResponse.success(iHighQualityStudyProvincesService.getProvinceScoreSort()); + } + } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/dao/HighQualityStudyMapper.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/dao/HighQualityStudyMapper.java new file mode 100644 index 0000000..e4fa18b --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/dao/HighQualityStudyMapper.java @@ -0,0 +1,13 @@ +package com.chinaunicom.mall.ebtp.extend.highquality.dao; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.chinaunicom.mall.ebtp.extend.highquality.entity.HighQualityStudy; + +/** +* @auto.generated +*/ +public interface HighQualityStudyMapper extends BaseMapper { + + +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/dao/HighQualityStudyProvincesMapper.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/dao/HighQualityStudyProvincesMapper.java new file mode 100644 index 0000000..4738f0e --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/dao/HighQualityStudyProvincesMapper.java @@ -0,0 +1,13 @@ +package com.chinaunicom.mall.ebtp.extend.highquality.dao; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.chinaunicom.mall.ebtp.extend.highquality.entity.HighQualityStudyProvinces; + +/** +* @auto.generated +*/ +public interface HighQualityStudyProvincesMapper extends BaseMapper { + + +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/dao/mapper/HighQualityStudyMapper.xml b/src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/dao/mapper/HighQualityStudyMapper.xml new file mode 100644 index 0000000..5d2acfb --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/dao/mapper/HighQualityStudyMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + update high_quality_study + set + delete_flag="deleted" + where ID=#{id,jdbcType=BIGINT} + + \ No newline at end of file diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/dao/mapper/HighQualityStudyProvincesMapper.xml b/src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/dao/mapper/HighQualityStudyProvincesMapper.xml new file mode 100644 index 0000000..671fe18 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/dao/mapper/HighQualityStudyProvincesMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + update high_quality_study_provinces + set + delete_flag="deleted" + where ID=#{id,jdbcType=BIGINT} + + \ No newline at end of file diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/entity/HighQualityStudy.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/entity/HighQualityStudy.java new file mode 100644 index 0000000..b74e8e2 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/entity/HighQualityStudy.java @@ -0,0 +1,105 @@ +package com.chinaunicom.mall.ebtp.extend.highquality.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.chinaunicom.mall.ebtp.common.config.CustomLocalDateTimeTypeHandler; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; +import java.io.Serializable; + +/** + * 实体类 HighQualityStudy + * + * @auto.generated + */ +@Data +@Accessors(chain = true) +@ApiModel +@EqualsAndHashCode(callSuper = false) +@TableName(value = "high_quality_study", autoResultMap = true) +public class HighQualityStudy implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * + */ + @ApiModelProperty(value = "") + private Integer id; + + /** + * 账号 + */ + @ApiModelProperty(value = "账号") + private String account; + + /** + * 姓名 + */ + @ApiModelProperty(value = "姓名") + private String name; + + /** + * 所属组织 + */ + @ApiModelProperty(value = "所属组织") + private String orgName; + + /** + * 电话 + */ + @ApiModelProperty(value = "电话") + private String tel; + + /** + * 是否及格 + */ + @ApiModelProperty(value = "是否及格") + private String passFlag; + + /** + * 得分 + */ + @ApiModelProperty(value = "得分") + private String score; + + /** + * 交卷时间 + */ + @ApiModelProperty(value = "交卷时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @TableField(typeHandler = CustomLocalDateTimeTypeHandler.class) + private java.time.LocalDateTime submitTime; + + /** + * 省分 + */ + @ApiModelProperty(value = "省分") + private String province; + + /** + * 试卷名称 + */ + @ApiModelProperty(value = "试卷名称") + private String testPaperName; + + /** + * 是否当前 0-否 1-是 + */ + @ApiModelProperty(value = "是否当前 0-否 1-是") + private Integer status; + + /** + * 排名 + */ + @ApiModelProperty(value = "排名") + private Integer scoreSort; + + +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/entity/HighQualityStudyProvinces.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/entity/HighQualityStudyProvinces.java new file mode 100644 index 0000000..d62b864 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/entity/HighQualityStudyProvinces.java @@ -0,0 +1,65 @@ +package com.chinaunicom.mall.ebtp.extend.highquality.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; +import java.io.Serializable; + +/** + * 实体类 HighQualityStudyProvinces + * + * @auto.generated + */ +@Data +@Accessors(chain = true) +@ApiModel +@EqualsAndHashCode(callSuper = false) +@TableName(value = "high_quality_study_provinces", autoResultMap = true) +public class HighQualityStudyProvinces implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * + */ + @ApiModelProperty(value = "") + private Integer id; + + /** + * 得分 + */ + @ApiModelProperty(value = "得分") + private String score; + + /** + * 排名 + */ + @ApiModelProperty(value = "排名") + private Integer scoreSort; + + /** + * 省分 + */ + @ApiModelProperty(value = "省分") + private String province; + + /** + * 试卷名称 + */ + @ApiModelProperty(value = "试卷名称") + private String testPaperName; + + /** + * 是否当前 0-否 1-是 + */ + @ApiModelProperty(value = "是否当前 0-否 1-是") + private Integer status; + + +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/service/IHighQualityStudyProvincesService.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/service/IHighQualityStudyProvincesService.java new file mode 100644 index 0000000..5a12f43 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/service/IHighQualityStudyProvincesService.java @@ -0,0 +1,18 @@ +package com.chinaunicom.mall.ebtp.extend.highquality.service; + + +import com.baomidou.mybatisplus.extension.service.IService; +import com.chinaunicom.mall.ebtp.extend.highquality.entity.HighQualityStudyProvinces; + +import java.util.List; + +/** + * 对数据表 high_quality_study_provinces 操作的 service + * @author Auto create + * + */ +public interface IHighQualityStudyProvincesService extends IService{ + + + List getProvinceScoreSort(); +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/service/IHighQualityStudyService.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/service/IHighQualityStudyService.java new file mode 100644 index 0000000..a08695d --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/service/IHighQualityStudyService.java @@ -0,0 +1,18 @@ +package com.chinaunicom.mall.ebtp.extend.highquality.service; + + +import com.baomidou.mybatisplus.extension.service.IService; +import com.chinaunicom.mall.ebtp.extend.highquality.entity.HighQualityStudy; + +import java.util.List; + +/** + * 对数据表 high_quality_study 操作的 service + * @author Auto create + * + */ +public interface IHighQualityStudyService extends IService{ + + + List getPersonScoreSort(); +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/service/impl/HighQualityStudyProvincesServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/service/impl/HighQualityStudyProvincesServiceImpl.java new file mode 100644 index 0000000..a40d94d --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/service/impl/HighQualityStudyProvincesServiceImpl.java @@ -0,0 +1,29 @@ +package com.chinaunicom.mall.ebtp.extend.highquality.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.chinaunicom.mall.ebtp.extend.highquality.dao.HighQualityStudyProvincesMapper; +import com.chinaunicom.mall.ebtp.extend.highquality.entity.HighQualityStudy; +import com.chinaunicom.mall.ebtp.extend.highquality.entity.HighQualityStudyProvinces; +import com.chinaunicom.mall.ebtp.extend.highquality.service.IHighQualityStudyProvincesService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 对数据表 high_quality_study_provinces 操作的 serviceImpl + * @auto.generated + * + */ +@Service +public class HighQualityStudyProvincesServiceImpl extends ServiceImpl implements IHighQualityStudyProvincesService { + + @Override + public List getProvinceScoreSort(){ + LambdaQueryWrapper query = Wrappers.lambdaQuery(); + query.eq(HighQualityStudyProvinces::getStatus,1); + query.orderByAsc(HighQualityStudyProvinces::getScoreSort); + return this.list(query); + } +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/service/impl/HighQualityStudyServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/service/impl/HighQualityStudyServiceImpl.java new file mode 100644 index 0000000..8e5a590 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/service/impl/HighQualityStudyServiceImpl.java @@ -0,0 +1,30 @@ +package com.chinaunicom.mall.ebtp.extend.highquality.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.chinaunicom.mall.ebtp.extend.highquality.dao.HighQualityStudyMapper; +import com.chinaunicom.mall.ebtp.extend.highquality.entity.HighQualityStudy; +import com.chinaunicom.mall.ebtp.extend.highquality.service.IHighQualityStudyService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 对数据表 high_quality_study 操作的 serviceImpl + * @auto.generated + * + */ +@Service +public class HighQualityStudyServiceImpl extends ServiceImpl implements IHighQualityStudyService { + + + @Override + public List getPersonScoreSort(){ + LambdaQueryWrapper query = Wrappers.lambdaQuery(); + query.eq(HighQualityStudy::getStatus,1); + query.orderByAsc(HighQualityStudy::getScoreSort); + query.orderByAsc(HighQualityStudy::getAccount); + return this.list(query); + } +}