Merge branch 'master' of ssh://1.15.26.233:10022/miaxis/twzd

twzd-admin/src/main/java/com/miaxis/app/controller/h5/ScoreInfoController.java

@@ -10,7 +10,9 @@ import com.miaxis.common.utils.SecurityUtils;
 import com.miaxis.score.domain.ScoreInfo;
 import com.miaxis.score.dto.ScoreInfoAllDTO;
 import com.miaxis.score.dto.ScoreInfoDTO;
+import com.miaxis.score.dto.ScoreInfoUserIdDTO;
 import com.miaxis.score.service.IScoreInfoService;
+import com.miaxis.score.vo.ScoreInfoH5Vo;
 import io.swagger.annotations.*;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -90,15 +92,15 @@ public class ScoreInfoController extends BaseController {
     /**
      * 删除模拟考成绩
      */
-    @Log(title = "模拟考成绩", businessType = BusinessTypeEnum.DELETE)
-	@DeleteMapping("/{ids}")
-    @ApiOperation("删除模拟考成绩")
-    public Response<Integer> remove(
-            @ApiParam(name = "ids", value = "模拟考成绩ids参数", required = true)
-            @PathVariable Long[] ids
-    ){
-        return toResponse(scoreInfoService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
-    }
+//    @Log(title = "模拟考成绩", businessType = BusinessTypeEnum.DELETE)
+//	@DeleteMapping("/{ids}")
+//    @ApiOperation("删除模拟考成绩")
+//    public Response<Integer> remove(
+//            @ApiParam(name = "ids", value = "模拟考成绩ids参数", required = true)
+//            @PathVariable Long[] ids
+//    ){
+//        return toResponse(scoreInfoService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
+//    }
 
 
     /**
@@ -139,4 +141,28 @@ public class ScoreInfoController extends BaseController {
         ScoreInfoAllDTO scoreInfoAllDTO = scoreInfoService.getScoreInfoAll(scoreInfo);
         return Response.success(scoreInfoAllDTO);
     }
+
+    /**
+     * 根据用户ID获取列表
+     */
+    @GetMapping(value = "/getScoreInfoByUserId")
+    @ApiOperation("根据用户ID获取列表")
+    public Response<List<ScoreInfoH5Vo>> getScoreInfoByUserId(ScoreInfoUserIdDTO scoreInfoUserIdDTO){
+        List<ScoreInfoH5Vo> list = scoreInfoService.getScoreInfoByUserId(scoreInfoUserIdDTO);
+        return Response.success(list);
+    }
+
+    /**
+     * 根据userID获取最大成绩，平均成绩，预测成绩
+     */
+    @GetMapping(value = "/getScoreInfoAllByUserId")
+    @ApiOperation("根据userID获取最大成绩，平均成绩，预测成绩")
+    public Response<ScoreInfoAllDTO> getScoreInfoAllByUserId(ScoreInfoUserIdDTO scoreInfoUserIdDTO){
+        ScoreInfo scoreInfo = new ScoreInfo();
+        scoreInfo.setUserId(scoreInfoUserIdDTO.getUserId());
+        ScoreInfoAllDTO scoreInfoAllDTO = scoreInfoService.getScoreInfoAll(scoreInfo);
+        return Response.success(scoreInfoAllDTO);
+    }
+
+
 }

twzd-admin/src/main/java/com/miaxis/pc/controller/area/AreaInfoController.java

@@ -0,0 +1,57 @@
+package com.miaxis.pc.controller.area;
+
+import com.miaxis.area.domain.AreaInfo;
+import com.miaxis.area.service.IAreaInfoService;
+import com.miaxis.common.core.controller.BaseController;
+import com.miaxis.common.core.domain.Response;
+import com.miaxis.common.core.page.ResponsePageInfo;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 【地区】Controller
+ *
+ * @author miaxis
+ * @date 2022-03-14
+ */
+@RestController
+@RequestMapping("/area/info")
+@Api(tags={"【PC-地区】"})
+public class AreaInfoController extends BaseController{
+    @Autowired
+    private IAreaInfoService areaInfoService;
+
+    /**
+     * 查询地区列表
+     */
+    @GetMapping("/list")
+    @ApiOperation("查询地区列表")
+        @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
+            @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
+    })
+    public ResponsePageInfo<AreaInfo> list(@ModelAttribute AreaInfo areaInfo){
+        startPage();
+        List<AreaInfo> list = areaInfoService.selectAreaInfoList(areaInfo);
+        return toResponsePageInfo(list);
+    }
+    
+
+    /**
+     * 获取地区详细信息
+     */
+    @GetMapping(value = "/{code}")
+    @ApiOperation("获取地区详细信息")
+    public Response<AreaInfo> getInfo(
+            @ApiParam(name = "code", value = "地区参数", required = true)
+            @PathVariable("code") String code
+    ){
+        return Response.success(areaInfoService.getById(code));
+    }
+
+
+
+}

twzd-admin/src/main/java/com/miaxis/pc/controller/question/PcScoreInfoController.java

@@ -0,0 +1,86 @@
+package com.miaxis.pc.controller.question;
+
+import com.miaxis.common.annotation.Log;
+import com.miaxis.common.constant.Constants;
+import com.miaxis.common.core.controller.BaseController;
+import com.miaxis.common.core.domain.Response;
+import com.miaxis.common.core.page.ResponsePageInfo;
+import com.miaxis.common.enums.BusinessTypeEnum;
+import com.miaxis.common.utils.SecurityUtils;
+import com.miaxis.question.dto.QuestionInfoDTO;
+import com.miaxis.score.domain.ScoreInfo;
+import com.miaxis.score.dto.ScoreInfoAllDTO;
+import com.miaxis.score.dto.ScoreInfoDTO;
+import com.miaxis.score.dto.ScoreInfoPcDTO;
+import com.miaxis.score.service.IScoreInfoService;
+import com.miaxis.score.vo.ScoreInfoPcVo;
+import io.swagger.annotations.*;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 【模拟考成绩】Controller
+ *
+ * @author miaxis
+ * @date 2021-08-23
+ */
+@RestController
+@RequestMapping("score/info")
+@Api(tags={"【PC-模拟考成绩】"})
+public class PcScoreInfoController extends BaseController {
+    @Autowired
+    private IScoreInfoService scoreInfoService;
+
+    /**
+     * 查询模拟考成绩列表
+     */
+    @GetMapping("/list")
+    @ApiOperation("查询模拟考成绩列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
+            @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
+    })
+    public ResponsePageInfo<ScoreInfoPcVo> list(@ModelAttribute ScoreInfoPcDTO scoreInfoPcDTO){
+        startPage();
+        List<ScoreInfoPcVo> list = scoreInfoService.selectScoreInfoPcList(scoreInfoPcDTO);
+        return toResponsePageInfo(list);
+    }
+
+
+
+
+
+
+    /**
+     * 修改模拟考成绩
+     */
+    @Log(title = "模拟考成绩", businessType = BusinessTypeEnum.UPDATE)
+    @PutMapping
+    @ApiOperation("修改模拟考成绩")
+    public Response<Integer> edit(@RequestBody ScoreInfo scoreInfo){
+        return toResponse(scoreInfoService.updateById(scoreInfo) ? 1 : 0);
+    }
+
+    /**
+     * 删除模拟考成绩
+     */
+    @Log(title = "模拟考成绩", businessType = BusinessTypeEnum.DELETE)
+	@DeleteMapping("/{ids}")
+    @ApiOperation("删除模拟考成绩")
+    public Response<Integer> remove(
+            @ApiParam(name = "ids", value = "模拟考成绩ids参数", required = true)
+            @PathVariable Long[] ids
+    ){
+        return toResponse(scoreInfoService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
+    }
+
+
+
+
+
+
+}

twzd-admin/src/main/java/com/miaxis/pc/controller/school/SchoolInfoController.java

@@ -0,0 +1,89 @@
+package com.miaxis.pc.controller.school;
+
+import com.miaxis.common.annotation.Log;
+import com.miaxis.common.core.controller.BaseController;
+import com.miaxis.common.core.domain.Response;
+import com.miaxis.common.core.page.ResponsePageInfo;
+import com.miaxis.common.enums.BusinessTypeEnum;
+import com.miaxis.school.domain.SchoolInfo;
+import com.miaxis.school.service.ISchoolInfoService;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 【驾校信息】Controller
+ *
+ * @author miaxis
+ * @date 2022-03-14
+ */
+@RestController
+@RequestMapping("/school/info")
+@Api(tags={"【PC-驾校信息】"})
+public class SchoolInfoController extends BaseController{
+    @Autowired
+    private ISchoolInfoService schoolInfoService;
+
+    /**
+     * 查询驾校信息列表
+     */
+    @GetMapping("/list")
+    @ApiOperation("查询驾校信息列表")
+        @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
+            @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
+    })
+    public ResponsePageInfo<SchoolInfo> list(@ModelAttribute SchoolInfo schoolInfo){
+        startPage();
+        List<SchoolInfo> list = schoolInfoService.selectSchoolInfoList(schoolInfo);
+        return toResponsePageInfo(list);
+    }
+    
+
+    /**
+     * 获取驾校信息详细信息
+     */
+    @GetMapping(value = "/{id}")
+    @ApiOperation("获取驾校信息详细信息")
+    public Response<SchoolInfo> getInfo(
+            @ApiParam(name = "id", value = "驾校信息参数", required = true)
+            @PathVariable("id") Long id
+    ){
+        return Response.success(schoolInfoService.getById(id));
+    }
+
+    /**
+     * 新增驾校信息
+     */
+    @Log(title = "驾校信息", businessType = BusinessTypeEnum.INSERT)
+    @PostMapping
+    @ApiOperation("新增驾校信息")
+    public Response<Integer> add(@RequestBody SchoolInfo schoolInfo){
+        return toResponse(schoolInfoService.save(schoolInfo) ? 1 : 0);
+    }
+
+    /**
+     * 修改驾校信息
+     */
+    @Log(title = "驾校信息", businessType = BusinessTypeEnum.UPDATE)
+    @PutMapping
+    @ApiOperation("修改驾校信息")
+    public Response<Integer> edit(@RequestBody SchoolInfo schoolInfo){
+        return toResponse(schoolInfoService.updateById(schoolInfo) ? 1 : 0);
+    }
+
+    /**
+     * 删除驾校信息
+     */
+//    @Log(title = "驾校信息", businessType = BusinessTypeEnum.DELETE)
+//	@DeleteMapping("/{ids}")
+//    @ApiOperation("删除驾校信息")
+//    public  Response<Integer> remove(
+//            @ApiParam(name = "ids", value = "驾校信息ids参数", required = true)
+//            @PathVariable Long[] ids
+//    ){
+//        return toResponse(schoolInfoService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
+//    }
+}

twzd-service/src/main/java/com/miaxis/area/domain/AreaInfo.java

@@ -0,0 +1,89 @@
+package com.miaxis.area.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.miaxis.common.annotation.Excel;
+import com.miaxis.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.miaxis.common.core.domain.BaseBusinessEntity;
+import lombok.Data;
+/**
+ * 地区对象 area_info
+ *
+ * @author miaxis
+ * @date 2022-03-14
+ */
+@Data
+@TableName("area_info")
+@ApiModel(value = "AreaInfo", description = "地区对象 area_info")
+public class AreaInfo extends BaseBusinessEntity{
+    private static final long serialVersionUID = 1L;
+
+    /** 主建 */
+    @Excel(name = "主建")
+    @TableId(value = "code")
+    @ApiModelProperty(value = "主建")
+    private String code;
+
+    /** 地区名 */
+    @Excel(name = "地区名")
+    @TableField("name")
+    @ApiModelProperty(value = "地区名")
+    private String name;
+
+    /** 是否叶子节点 0不是 1是 */
+    @Excel(name = "是否叶子节点 0不是 1是")
+    @TableField("leaf")
+    @ApiModelProperty(value = "是否叶子节点 0不是 1是")
+    private String leaf;
+
+    /** 父节点code */
+    @Excel(name = "父节点code")
+    @TableField("parent_code")
+    @ApiModelProperty(value = "父节点code")
+    private String parentCode;
+
+    public void setCode(String code){
+        this.code = code;
+    }
+
+    public String getCode(){
+        return code;
+    }
+    public void setName(String name){
+        this.name = name;
+    }
+
+    public String getName(){
+        return name;
+    }
+    public void setLeaf(String leaf){
+        this.leaf = leaf;
+    }
+
+    public String getLeaf(){
+        return leaf;
+    }
+    public void setParentCode(String parentCode){
+        this.parentCode = parentCode;
+    }
+
+    public String getParentCode(){
+        return parentCode;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("code", getCode())
+            .append("name", getName())
+            .append("leaf", getLeaf())
+            .append("parentCode", getParentCode())
+            .toString();
+    }
+}

twzd-service/src/main/java/com/miaxis/area/dto/AreaDTO.java

@@ -0,0 +1,189 @@
+package com.miaxis.area.dto;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.miaxis.common.core.domain.BaseBusinessEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 题库对象 question_info
+ *
+ * @author miaxis
+ * @date 2021-10-20
+ */
+@Data
+@ApiModel(value = "AreaDTO", description = "区域对像")
+public class AreaDTO extends BaseBusinessEntity{
+    private static final long serialVersionUID = 1L;
+
+    /**  主键 */
+    @ApiModelProperty(value = " 主键")
+    private Long id;
+
+    /** 在所有题目中的序号 */
+    @ApiModelProperty(value = "在所有题目中的序号")
+    private Long number;
+
+    /** 正确答案 */
+    @ApiModelProperty(value = "正确答案")
+    private String answer;
+
+    /** 答案关键词 */
+    @ApiModelProperty(value = "答案关键词")
+    private String answerkeyword;
+
+    /** 技巧讲解图片URL */
+    @ApiModelProperty(value = "技巧讲解图片URL")
+    private String explainGif;
+
+    /** 技巧讲解说明 */
+    @ApiModelProperty(value = "技巧讲解说明")
+    private String explainJq;
+
+    /** 官方解释 */
+    @ApiModelProperty(value = "官方解释")
+    private String explainJs;
+
+    /** 技巧讲解语音URL */
+    @ApiModelProperty(value = "技巧讲解语音URL")
+    private String explainMp3;
+
+    /** 题目图片URL */
+    @ApiModelProperty(value = "题目图片URL")
+    private String image;
+
+    /** 题目图片URL2 */
+    @ApiModelProperty(value = "题目图片URL2")
+    private String imageYdt;
+
+    /** 题目 */
+    @ApiModelProperty(value = "题目")
+    private String issue;
+
+    /** 答案选项 */
+    @ApiModelProperty(value = "答案选项")
+    private String opts;
+
+    /** 答题技巧关键词 */
+    @ApiModelProperty(value = "答题技巧关键词")
+    private String skillkeyword;
+
+    /** 题目关键词 */
+    @ApiModelProperty(value = "题目关键词")
+    private String titlekeyword;
+
+    /** 读题语音URL */
+    @ApiModelProperty(value = "读题语音URL")
+    private String issuemp3;
+
+    /** 答案语音URL */
+    @ApiModelProperty(value = "答案语音URL")
+    private String answermp3;
+
+    /** 读题+答案语音URL */
+    @ApiModelProperty(value = "读题+答案语音URL")
+    private String explainjsmp3;
+
+
+    /** 是否是C1,C2,C3驾驶证题目 */
+    @ApiModelProperty(value = "是否是C1,C2,C3驾驶证题目")
+    private String liceCar;
+
+    /** 是否是A1\A3\B1驾驶证题目 */
+    @ApiModelProperty(value = "是否是A1,A3,B1驾驶证题目")
+    private String liceBus;
+
+    /** 是否是A2\B2驾驶证题目 */
+    @ApiModelProperty(value = "是否是A2,B2驾驶证题目")
+    private String liceTruck;
+
+    /** 是否是D\E\F驾驶证题目 */
+    @ApiModelProperty(value = "是否是D,E,F驾驶证题目")
+    private String liceMoto;
+
+    /** 顺序练习分类（包含科一到科四） */
+    @ApiModelProperty(value = "顺序练习分类 0否 1是")
+    private String sequeIssue;
+
+    /** 分类练习（包含科一到科四） */
+    @ApiModelProperty(value = "分类练习 0否 1是")
+    private String classIssue;
+
+    /** 地方专题（包含科一到科四） */
+    @ApiModelProperty(value = "地方专题 0否 1是")
+    private String placeIssue;
+
+    /** 精选题（包含科一到科四） */
+    @ApiModelProperty(value = "精选题 0否 1是")
+    private String excellIssue;
+
+    /** 是否是仿真考试题目 */
+    @ApiModelProperty(value = "是否是仿真考试题目")
+    private String copyIssue;
+
+    /** 是否是真实考场模拟题目 */
+    @ApiModelProperty(value = "是否是真实考场模拟题目")
+    private String mockIssue;
+
+    /** 题目在顺序练习中所属的模块名称 */
+    @ApiModelProperty(value = "题目在顺序练习中所属的模块名称")
+    private String sequeIssueName;
+
+    /** 题目在地方专题中所属的模块名称 */
+    @ApiModelProperty(value = "题目在地方专题中所属的模块名称")
+    private String placeIssueName;
+
+    /** 题目在精选中所属的模块名称 */
+    @ApiModelProperty(value = "题目在精选中所属的模块名称")
+    private String excellIssueName;
+
+    /** 题目在分类中所属的模块名称 */
+    @ApiModelProperty(value = "题目在分类中所属的模块名称")
+    private String classIssueName;
+
+    /** 是否随机 */
+    @ApiModelProperty(value = "是否随机")
+    private String isRand;
+
+
+    /** 题目类型 */
+    @ApiModelProperty(value = "题目类型 1判断，2选择，3多选")
+    private Integer questionType;
+
+
+    /** 科目 */
+    @ApiModelProperty(value = "科目")
+    private Integer subject;
+
+//    /** 分类练习排序字段 */
+//    @ApiModelProperty(value = "分类练习排序字段")
+//    private Integer classSort;
+//
+//    /** 精选考题排序字段 */
+//    @ApiModelProperty(value = "精选考题排序字段")
+//    private Integer excellSort;
+//
+//
+//    /** 顺序练习排序字段 */
+//    @ApiModelProperty(value = "顺序练习排序字段")
+//    private Integer sequeSort;
+//
+//
+//    /** 地方专题排序字段 */
+//    @ApiModelProperty(value = "地方专题排序字段")
+//    private Integer placeSort;
+
+    /** 排序字段  1:分类练习：class_sort;2:精选考题:excell_sort;3:顺序练习:seque_sort;4:地方专题:place_sort;*/
+    @ApiModelProperty(value = "1:分类练习;2:精选考题;3:顺序练习;4:地方专题;")
+    private Integer sort;
+
+    /**
+     * 1:分类练习：class_sort;2:精选考题:excell_sort;3:顺序练习:seque_sort;4:地方专题:place_sort;
+     */
+    @ApiModelProperty(value = "分类字段名",hidden = true)
+    private String sortName;
+
+
+
+}

twzd-service/src/main/java/com/miaxis/area/mapper/AreaInfoMapper.java

@@ -0,0 +1,22 @@
+package com.miaxis.area.mapper;
+
+import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.miaxis.area.domain.AreaInfo;
+
+/**
+ * 地区Mapper接口
+ *
+ * @author miaxis
+ * @date 2022-03-14
+ */
+public interface AreaInfoMapper extends BaseMapper<AreaInfo> {
+    /**
+     * 查询地区列表
+     *
+     * @param areaInfo 地区
+     * @return 地区集合
+     */
+    public List<AreaInfo> selectAreaInfoList(AreaInfo areaInfo);
+
+}

twzd-service/src/main/java/com/miaxis/area/service/IAreaInfoService.java

@@ -0,0 +1,21 @@
+package com.miaxis.area.service;
+
+import java.util.List;
+import com.miaxis.area.domain.AreaInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 地区Service接口
+ *
+ * @author miaxis
+ * @date 2022-03-14
+ */
+public interface IAreaInfoService extends IService<AreaInfo>{
+    /**
+     * 查询地区列表
+     *
+     * @param areaInfo 地区
+     * @return 地区集合
+     */
+    public List<AreaInfo> selectAreaInfoList(AreaInfo areaInfo);
+}

twzd-service/src/main/java/com/miaxis/area/service/impl/AreaInfoServiceImpl.java

@@ -0,0 +1,35 @@
+package com.miaxis.area.service.impl;
+
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.apache.commons.lang3.StringUtils;
+import com.miaxis.area.mapper.AreaInfoMapper;
+import com.miaxis.area.domain.AreaInfo;
+import com.miaxis.area.service.IAreaInfoService;
+
+/**
+ * 地区Service业务层处理
+ *
+ * @author miaxis
+ * @date 2022-03-14
+ */
+@Service
+public class AreaInfoServiceImpl extends ServiceImpl<AreaInfoMapper, AreaInfo> implements IAreaInfoService {
+    @Autowired
+    private AreaInfoMapper areaInfoMapper;
+
+    /**
+     * 查询地区列表
+     *
+     * @param areaInfo 地区
+     * @return 地区
+     */
+    @Override
+    public List<AreaInfo> selectAreaInfoList(AreaInfo areaInfo){
+        return areaInfoMapper.selectAreaInfoList(areaInfo);
+    }
+}

twzd-service/src/main/java/com/miaxis/question/service/impl/QuestionCollectionServiceImpl.java

@@ -33,6 +33,7 @@ public class QuestionCollectionServiceImpl extends ServiceImpl<QuestionCollectio
     @Override
     public List<QuestionCollection> selectQuestionCollectionList(QuestionCollectionListDTO questionCollection){
         return questionCollectionMapper.selectQuestionCollectionList(questionCollection);
+
     }
 
 }

twzd-service/src/main/java/com/miaxis/school/domain/SchoolInfo.java

@@ -1,20 +1,22 @@
 package com.miaxis.school.domain;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import com.miaxis.common.annotation.Excel;
-import com.miaxis.common.core.domain.BaseBusinessEntity;
+import com.miaxis.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.miaxis.common.core.domain.BaseBusinessEntity;
 import lombok.Data;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 /**
  * 驾校信息对象 school_info
  *
- * @author chenjian
- * @date 2022-01-20
+ * @author miaxis
+ * @date 2022-03-14
  */
 @Data
 @TableName("school_info")

twzd-service/src/main/java/com/miaxis/school/mapper/SchoolInfoMapper.java

@@ -1,17 +1,17 @@
 package com.miaxis.school.mapper;
 
+import java.util.List;
+import java.util.Map;
+
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.miaxis.school.domain.SchoolInfo;
 import com.miaxis.wx.dto.QueryParams;
 
-import java.util.List;
-import java.util.Map;
-
 /**
  * 驾校信息Mapper接口
  *
  * @author miaxis
- * @date 2022-01-20
+ * @date 2022-03-14
  */
 public interface SchoolInfoMapper extends BaseMapper<SchoolInfo> {
     /**
@@ -22,5 +22,5 @@ public interface SchoolInfoMapper extends BaseMapper<SchoolInfo> {
      */
     public List<SchoolInfo> selectSchoolInfoList(SchoolInfo schoolInfo);
 
-    List<Map> queryNames(QueryParams queryParams);
+    List<Map> queryNames(QueryParams queryParamsArea);
 }

twzd-service/src/main/java/com/miaxis/school/service/ISchoolInfoService.java

@@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * 驾校信息Service接口
  *
  * @author miaxis
- * @date 2022-01-20
+ * @date 2022-03-14
  */
 public interface ISchoolInfoService extends IService<SchoolInfo>{
     /**

twzd-service/src/main/java/com/miaxis/school/service/impl/SchoolInfoServiceImpl.java

@@ -16,7 +16,7 @@ import com.miaxis.school.service.ISchoolInfoService;
  * 驾校信息Service业务层处理
  *
  * @author miaxis
- * @date 2022-01-20
+ * @date 2022-03-14
  */
 @Service
 public class SchoolInfoServiceImpl extends ServiceImpl<SchoolInfoMapper, SchoolInfo> implements ISchoolInfoService {

twzd-service/src/main/java/com/miaxis/score/dto/ScoreInfoPcDTO.java

@@ -0,0 +1,37 @@
+package com.miaxis.score.dto;
+
+import com.miaxis.common.core.domain.BaseBusinessEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ *
+ * @author miaxis
+ * @date 2021-08-23
+ */
+@Data
+public class ScoreInfoPcDTO extends BaseBusinessEntity {
+    private static final long serialVersionUID = 1L;
+
+
+    /**  昵称*/
+    @ApiModelProperty(value = "昵称")
+    private String nickName;
+
+    /** 驾校名称 */
+    @ApiModelProperty(value = "驾校名称")
+    private String schoolName;
+
+    /** 市级 */
+    @ApiModelProperty(value = "市级")
+    private String cityName;
+
+    /** 区级 */
+    @ApiModelProperty(value = "区级")
+    private String areaName;
+
+    /** 车型 */
+    @ApiModelProperty(value = "车型")
+    private String type;
+
+}

twzd-service/src/main/java/com/miaxis/score/dto/ScoreInfoUserIdDTO.java

@@ -0,0 +1,22 @@
+package com.miaxis.score.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 模拟考成绩对象 score_info
+ *
+ * @author miaxis
+ * @date 2021-08-23
+ */
+@Data
+public class ScoreInfoUserIdDTO {
+    private static final long serialVersionUID = 1L;
+
+
+    /** 用户id */
+    @ApiModelProperty(value = "用户ID")
+    private Long userId;
+
+
+}

twzd-service/src/main/java/com/miaxis/score/mapper/ScoreInfoMapper.java

@@ -2,6 +2,10 @@ package com.miaxis.score.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.miaxis.score.domain.ScoreInfo;
+import com.miaxis.score.dto.ScoreInfoPcDTO;
+import com.miaxis.score.dto.ScoreInfoUserIdDTO;
+import com.miaxis.score.vo.ScoreInfoH5Vo;
+import com.miaxis.score.vo.ScoreInfoPcVo;
 
 import java.util.List;
 
@@ -42,4 +46,9 @@ public interface ScoreInfoMapper extends BaseMapper<ScoreInfo> {
      * @return
      */
     public int getMaxScore(ScoreInfo scoreInfo);
+
+
+    public List<ScoreInfoPcVo> selectScoreInfoPcList(ScoreInfoPcDTO scoreInfoPcDTO);
+
+    List<ScoreInfoH5Vo> getScoreInfoByUserId(ScoreInfoUserIdDTO scoreInfoUserIdDTO);
 }

twzd-service/src/main/java/com/miaxis/score/service/IScoreInfoService.java

@@ -3,6 +3,10 @@ package com.miaxis.score.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.miaxis.score.domain.ScoreInfo;
 import com.miaxis.score.dto.ScoreInfoAllDTO;
+import com.miaxis.score.dto.ScoreInfoPcDTO;
+import com.miaxis.score.dto.ScoreInfoUserIdDTO;
+import com.miaxis.score.vo.ScoreInfoH5Vo;
+import com.miaxis.score.vo.ScoreInfoPcVo;
 
 import java.util.List;
 
@@ -52,4 +56,8 @@ public interface IScoreInfoService extends IService<ScoreInfo>{
      * @return
      */
     public ScoreInfoAllDTO getScoreInfoAll(ScoreInfo scoreInfo);
+
+    List<ScoreInfoPcVo> selectScoreInfoPcList(ScoreInfoPcDTO scoreInfoPcDTO);
+
+    List<ScoreInfoH5Vo> getScoreInfoByUserId(ScoreInfoUserIdDTO scoreInfoUserIdDTO);
 }

twzd-service/src/main/java/com/miaxis/score/service/impl/ScoreInfoServiceImpl.java

@@ -1,14 +1,21 @@
 package com.miaxis.score.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.miaxis.school.mapper.SchoolInfoMapper;
 import com.miaxis.score.domain.ScoreInfo;
 import com.miaxis.score.dto.ScoreInfoAllDTO;
+import com.miaxis.score.dto.ScoreInfoPcDTO;
+import com.miaxis.score.dto.ScoreInfoUserIdDTO;
 import com.miaxis.score.mapper.ScoreInfoMapper;
 import com.miaxis.score.service.IScoreInfoService;
+import com.miaxis.score.vo.ScoreInfoH5Vo;
+import com.miaxis.score.vo.ScoreInfoPcVo;
+import com.miaxis.wx.dto.QueryParams;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 模拟考成绩Service业务层处理
@@ -75,4 +82,15 @@ public class ScoreInfoServiceImpl extends ServiceImpl<ScoreInfoMapper, ScoreInfo
         return scoreInfoAllDTO;
     }
 
+    @Override
+    public List<ScoreInfoPcVo> selectScoreInfoPcList(ScoreInfoPcDTO scoreInfoPcDTO) {
+        return scoreInfoMapper.selectScoreInfoPcList(scoreInfoPcDTO);
+    }
+
+    @Override
+    public List<ScoreInfoH5Vo> getScoreInfoByUserId(ScoreInfoUserIdDTO scoreInfoUserIdDTO) {
+        return scoreInfoMapper.getScoreInfoByUserId(scoreInfoUserIdDTO);
+    }
+
+
 }

twzd-service/src/main/java/com/miaxis/score/vo/ScoreInfoH5Vo.java

@@ -0,0 +1,44 @@
+package com.miaxis.score.vo;
+
+import com.miaxis.common.core.domain.BaseBusinessEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ *
+ * @author miaxis
+ * @date 2021-08-23
+ */
+@Data
+public class ScoreInfoH5Vo extends BaseBusinessEntity {
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    @ApiModelProperty(value = "主键")
+    private Long id;
+
+    /** 用户ID */
+    @ApiModelProperty(value = "用户ID")
+    private Long userId;
+
+    /** 头像 */
+    @ApiModelProperty(value = "头像")
+    private String headImage;
+
+    /** 昵称 */
+    @ApiModelProperty(value = "昵称")
+    private String nickName;
+
+    /**  车型 */
+    @ApiModelProperty(value = "车型")
+    private String type;
+
+    /** 考试科目 */
+    @ApiModelProperty(value = "考试科目")
+    private String kskm;
+
+    /** 分数 */
+    @ApiModelProperty(value = "分数")
+    private Long score;
+
+}

twzd-service/src/main/java/com/miaxis/score/vo/ScoreInfoPcVo.java

@@ -0,0 +1,44 @@
+package com.miaxis.score.vo;
+
+import com.miaxis.common.core.domain.BaseBusinessEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ *
+ * @author miaxis
+ * @date 2021-08-23
+ */
+@Data
+public class ScoreInfoPcVo extends BaseBusinessEntity {
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    @ApiModelProperty(value = "主键")
+    private Long id;
+
+    /** 用户ID */
+    @ApiModelProperty(value = "用户ID")
+    private Long userId;
+
+    /** 头像 */
+    @ApiModelProperty(value = "头像")
+    private String headImage;
+
+    /** 昵称 */
+    @ApiModelProperty(value = "昵称")
+    private String nickName;
+
+    /**  车型 */
+    @ApiModelProperty(value = "车型")
+    private String type;
+
+    /** 考试科目 */
+    @ApiModelProperty(value = "考试科目")
+    private String kskm;
+
+    /** 分数 */
+    @ApiModelProperty(value = "分数")
+    private Long score;
+
+}

twzd-service/src/main/resources/mapper/area/AreaInfoMapper.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.miaxis.area.mapper.AreaInfoMapper">
+
+    <resultMap type="AreaInfo" id="AreaInfoResult">
+        <result property="code"    column="code"    />
+        <result property="name"    column="name"    />
+        <result property="leaf"    column="leaf"    />
+        <result property="parentCode"    column="parent_code"    />
+    </resultMap>
+
+    <sql id="selectAreaInfoVo">
+        select * from area_info
+    </sql>
+
+    <select id="selectAreaInfoList" parameterType="AreaInfo" resultMap="AreaInfoResult">
+        <include refid="selectAreaInfoVo"/>
+        <where>
+            <if test="code != null  and code != ''"> and code = #{code}</if>
+            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
+            <if test="leaf != null  and leaf != ''"> and leaf = #{leaf}</if>
+            <if test="parentCode != null  and parentCode != ''"> and parent_code = #{parentCode}</if>
+        </where>
+    </select>
+
+</mapper>

twzd-service/src/main/resources/mapper/score/ScoreInfoMapper.xml

@@ -14,6 +14,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"    column="update_time"    />
     </resultMap>
 
+
+    <resultMap type="ScoreInfoH5Vo" id="ScoreInfoH5Result">
+        <result property="id"    column="id"    />
+        <result property="userId"    column="user_id"    />
+        <result property="headImage"    column="head_Image"    />
+        <result property="nickName"    column="nick_name"    />
+        <result property="type"    column="type"    />
+        <result property="kskm"    column="kskm"    />
+        <result property="score"    column="score"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+
     <sql id="selectScoreInfoVo">
         select * from score_info
     </sql>
@@ -55,4 +69,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
 
+    <select id="selectScoreInfoPcList" parameterType="ScoreInfoPcDTO" resultType="com.miaxis.score.vo.ScoreInfoPcVo">
+        SELECT s.id,s.user_id,u.head_image,u.nick_name,s.type,s.kskm,s.score,s.create_time
+                FROM user_info u JOIN score_info s ON u.id = s.user_id
+        <where>
+            <if test="cityName != null and cityName != ''"> and u.city_name like concat('%', #{cityName}, '%')</if>
+            <if test="areaName != null and areaName != ''"> and u.area_name like concat('%', #{areaName}, '%')</if>
+            <if test="schoolName != null and schoolName != ''"> and u.school_name like concat('%', #{schoolName}, '%')</if>
+            <if test="nickName != null and nickName != ''"> and u.nick_name like concat('%', #{nickName}, '%')</if>
+            <if test="type != null and type != ''"> and s.type = #{type} </if>
+        </where>
+        order by user_id,create_time desc
+    </select>
+
+    <select id="getScoreInfoByUserId" parameterType="ScoreInfoUserIdDTO" resultMap="ScoreInfoH5Result">
+        SELECT s.id,s.user_id,u.head_image,u.nick_name,s.type,s.kskm,s.score,s.create_time
+        FROM user_info u JOIN score_info s ON u.id = s.user_id
+        <where>
+            <if test="userId != null"> and s.user_id =  #{userId} </if>
+        </where>
+        order by user_id,create_time desc
+    </select>
+
+
+
+
 </mapper>