Merge branch 'master-高质量运营2' into uat_code

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<List<HighQualityStudy>> getPersonScoreSort(){
+        return BaseResponse.success(iHighQualityStudyService.getPersonScoreSort());
+    }
+
+    /**
+     * 查询省分排行
+     *
+     * @param
+     *
+     * @return
+     */
+    @ApiOperation("查询省分排行")
+    @PostMapping("/getProvinceScoreSort")
+    public BaseResponse<List<HighQualityStudyProvinces>> getProvinceScoreSort(){
+        return BaseResponse.success(iHighQualityStudyProvincesService.getProvinceScoreSort());
+    }
+
 }

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<HighQualityStudy> {
+
+	
+}

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<HighQualityStudyProvinces> {
+
+	
+}

src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/dao/mapper/HighQualityStudyMapper.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.chinaunicom.mall.ebtp.extend.highquality.dao.HighQualityStudyMapper">
+    <resultMap id="BaseResultMap"
+               type="com.chinaunicom.mall.ebtp.extend.highquality.entity.HighQualityStudy">
+            <result column="id"  jdbcType="INTEGER"  property="id"/>
+            <result column="account"  jdbcType="VARCHAR" property="account"/>
+            <result column="name"  jdbcType="VARCHAR" property="name"/>
+            <result column="org_name"  jdbcType="VARCHAR" property="orgName"/>
+            <result column="tel"  jdbcType="VARCHAR" property="tel"/>
+            <result column="pass_flag"  jdbcType="VARCHAR" property="passFlag"/>
+            <result column="score"  jdbcType="VARCHAR" property="score"/>
+            <result column="submit_time"  jdbcType="TIMESTAMP"  property="submitTime"/>
+            <result column="province"  jdbcType="VARCHAR" property="province"/>
+            <result column="test_paper_name"  jdbcType="VARCHAR" property="testPaperName"/>
+            <result column="status"  jdbcType="INTEGER"  property="status"/>
+            <result column="score_sort"  jdbcType="INTEGER"  property="scoreSort"/>
+    </resultMap>
+
+    <!--逻辑删除方法 此方法为代码生成器生成 不允许修改 如有特殊需求 请自行新建SQL语句-->
+    <update id="deleteOff" parameterType="java.lang.Long">
+        update high_quality_study
+        set
+        delete_flag="deleted"
+        where ID=#{id,jdbcType=BIGINT}
+	</update>
+</mapper>

src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/dao/mapper/HighQualityStudyProvincesMapper.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.chinaunicom.mall.ebtp.extend.highquality.dao.HighQualityStudyProvincesMapper">
+    <resultMap id="BaseResultMap"
+               type="com.chinaunicom.mall.ebtp.extend.highquality.entity.HighQualityStudyProvinces">
+            <result column="id"  jdbcType="INTEGER"  property="id"/>
+            <result column="score"  jdbcType="VARCHAR" property="score"/>
+            <result column="score_sort"  jdbcType="INTEGER"  property="scoreSort"/>
+            <result column="province"  jdbcType="VARCHAR" property="province"/>
+            <result column="test_paper_name"  jdbcType="VARCHAR" property="testPaperName"/>
+            <result column="status"  jdbcType="INTEGER"  property="status"/>
+    </resultMap>
+
+    <!--逻辑删除方法 此方法为代码生成器生成 不允许修改 如有特殊需求 请自行新建SQL语句-->
+    <update id="deleteOff" parameterType="java.lang.Long">
+        update high_quality_study_provinces
+        set
+        delete_flag="deleted"
+        where ID=#{id,jdbcType=BIGINT}
+	</update>
+</mapper>

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;
+
+
+}

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;
+
+
+}

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<HighQualityStudyProvinces>{
+
+
+    List<HighQualityStudyProvinces> getProvinceScoreSort();
+}

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<HighQualityStudy>{
+
+
+    List<HighQualityStudy> getPersonScoreSort();
+}

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<HighQualityStudyProvincesMapper,HighQualityStudyProvinces>  implements IHighQualityStudyProvincesService  {
+
+    @Override
+    public List<HighQualityStudyProvinces> getProvinceScoreSort(){
+        LambdaQueryWrapper<HighQualityStudyProvinces> query = Wrappers.lambdaQuery();
+        query.eq(HighQualityStudyProvinces::getStatus,1);
+        query.orderByAsc(HighQualityStudyProvinces::getScoreSort);
+        return this.list(query);
+    }
+}

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<HighQualityStudyMapper,HighQualityStudy>  implements IHighQualityStudyService  {
+
+
+    @Override
+    public List<HighQualityStudy> getPersonScoreSort(){
+        LambdaQueryWrapper<HighQualityStudy> query = Wrappers.lambdaQuery();
+        query.eq(HighQualityStudy::getStatus,1);
+        query.orderByAsc(HighQualityStudy::getScoreSort);
+        query.orderByAsc(HighQualityStudy::getAccount);
+        return this.list(query);
+    }
+}