Merge branch 'master' of ssh://192.168.8.213:10022/miaxis/hzgzpt

hzgzpt-admin/src/main/java/com/miaxis/pc/controller/coach/PcCoachInfoController.java

@@ -51,13 +51,13 @@ public class PcCoachInfoController extends BaseController{
      * 获取教练详细信息
      */
     @PreAuthorize("@ss.hasPermi('coach:info:query')")
-    @GetMapping(value = "/{coachnum}")
+    @GetMapping(value = "/{id}")
     @ApiOperation("获取教练详细信息")
     public Response<CoachInfo> getInfo(
-            @ApiParam(name = "coachnum", value = "教练参数", required = true)
-            @PathVariable("coachnum") String coachnum
+            @ApiParam(name = "id", value = "教练id", required = true)
+            @PathVariable("id") Long id
     ){
-        return Response.success(coachInfoService.getById(coachnum));
+        return Response.success(coachInfoService.getById(id));
     }
 
     /**

hzgzpt-admin/src/main/java/com/miaxis/pc/controller/school/PcSchoolInfoController.java

@@ -5,6 +5,7 @@ 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.school.domain.SchoolInfo;
 import com.miaxis.school.dto.SchoolInfoPcDTO;
 import com.miaxis.school.service.ISchoolInfoService;
@@ -52,13 +53,13 @@ public class PcSchoolInfoController extends BaseController{
      * 获取驾校详细信息
      */
     @PreAuthorize("@ss.hasPermi('school:info:query')")
-    @GetMapping(value = "/{inscode}")
+    @GetMapping(value = "/{id}")
     @ApiOperation("获取驾校详细信息")
     public Response<SchoolInfoDetailPcVO> getSchoolInfoDetail(
-            @ApiParam(name = "inscode", value = "驾校全国统一编号", required = true)
-            @PathVariable("inscode") String inscode
+            @ApiParam(name = "id", value = "驾校id", required = true)
+            @PathVariable("id") Long id
     ){
-        return Response.success(schoolInfoService.getSchoolInfoDetail(inscode));
+        return Response.success(schoolInfoService.getSchoolInfoDetail(id));
     }
 
     /**

hzgzpt-service/src/main/java/com/miaxis/school/domain/SchoolClassType.java

@@ -28,6 +28,13 @@ public class SchoolClassType extends BaseBusinessEntity{
     @ApiModelProperty(value = "$column.columnComment")
     private Long id;
 
+    /**
+     * 驾校全国统一编号
+     */
+    @TableField(value = "inscode")
+    @ApiModelProperty(value = "驾校全国统一编号")
+    private String inscode;
+
     /** 班级名称 */
     @Excel(name = "班级名称")
     @TableField("class_name")

hzgzpt-service/src/main/java/com/miaxis/school/dto/SchoolClassTypePcDTO.java

@@ -2,6 +2,7 @@ package com.miaxis.school.dto;
 
 import com.miaxis.common.annotation.Excel;
 import com.miaxis.common.core.domain.BaseBusinessEntity;
+import com.miaxis.common.core.domain.BaseQueryEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -14,7 +15,7 @@ import lombok.Data;
  */
 @Data
 @ApiModel(value = "SchoolClassType", description = "pc驾校班型对象入参")
-public class SchoolClassTypePcDTO extends BaseBusinessEntity{
+public class SchoolClassTypePcDTO extends BaseQueryEntity {
 
     /** 班级名称 */
     @ApiModelProperty(value = "班级名称")

hzgzpt-service/src/main/java/com/miaxis/school/dto/SchoolInfoPcDTO.java

@@ -1,16 +1,11 @@
 package com.miaxis.school.dto;
 
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.miaxis.common.annotation.Excel;
 import com.miaxis.common.core.domain.BaseBusinessEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -24,6 +19,9 @@ import java.util.Date;
 public class SchoolInfoPcDTO extends BaseBusinessEntity {
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "id")
+    private Long id;
+
     /**
      * 驾校全国统一编号
      */

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

@@ -94,10 +94,10 @@ public interface SchoolInfoMapper extends BaseMapper<SchoolInfo> {
 
     /**
      * pc查询驾校详情
-     * @param inscode
+     * @param id
      * @return
      */
-    SchoolInfoDetailPcVO getSchoolInfoDetail(String inscode);
+    SchoolInfoDetailPcVO getSchoolInfoDetail(Long id);
 
     /**
      * pc删除驾校(逻辑删除)

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

@@ -1,6 +1,7 @@
 package com.miaxis.school.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.miaxis.common.annotation.DataScope;
 import com.miaxis.school.domain.SchoolInfo;
 import com.miaxis.school.dto.SchoolInfoDTO;
 import com.miaxis.school.dto.SchoolInfoEvalDTO;
@@ -92,10 +93,10 @@ public interface ISchoolInfoService extends IService<SchoolInfo>{
 
     /**
      * pc查询驾校详情
-     * @param inscode
+     * @param id
      * @return
      */
-    SchoolInfoDetailPcVO getSchoolInfoDetail(String inscode);
+    SchoolInfoDetailPcVO getSchoolInfoDetail(Long id);
 
     /**
      * pc删除驾校(逻辑删除)

hzgzpt-service/src/main/java/com/miaxis/school/service/impl/SchoolClassTypeServiceImpl.java

@@ -4,6 +4,7 @@ package com.miaxis.school.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.miaxis.common.annotation.DataScope;
 import com.miaxis.school.domain.SchoolClassType;
 import com.miaxis.school.dto.SchoolClassTypePcDTO;
 import com.miaxis.school.mapper.SchoolClassTypeMapper;
@@ -32,6 +33,7 @@ public class SchoolClassTypeServiceImpl extends ServiceImpl<SchoolClassTypeMappe
      * pc班型查询列表
      */
     @Override
+    @DataScope(deptAlias ="s")
     public List<SchoolClassTypePcVO> queryList(SchoolClassTypePcDTO schoolClassTypePcDTO) {
         return schoolClassTypeMapper.queryList(schoolClassTypePcDTO);
     }

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

@@ -1,6 +1,7 @@
 package com.miaxis.school.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.miaxis.common.annotation.DataScope;
 import com.miaxis.common.utils.DateUtils;
 import com.miaxis.school.domain.SchoolInfo;
 import com.miaxis.school.dto.SchoolInfoDTO;
@@ -133,12 +134,12 @@ public class SchoolInfoServiceImpl extends ServiceImpl<SchoolInfoMapper, SchoolI
 
     /**
      * pc查询驾校详情
-     * @param inscode
+     * @param id
      * @return
      */
     @Override
-    public SchoolInfoDetailPcVO getSchoolInfoDetail(String inscode) {
-        return schoolInfoMapper.getSchoolInfoDetail(inscode);
+    public SchoolInfoDetailPcVO getSchoolInfoDetail(Long id) {
+        return schoolInfoMapper.getSchoolInfoDetail(id);
     }
 
     /**

hzgzpt-service/src/main/resources/mapper/school/SchoolClassTypeMapper.xml

@@ -6,6 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <resultMap type="SchoolClassType" id="SchoolClassTypeResult">
         <result property="id"    column="id"    />
+        <result property="inscode"    column="inscode"    />
         <result property="className"    column="class_name"    />
         <result property="totalPrice"    column="total_price"    />
         <result property="train"    column="train"    />
@@ -29,22 +30,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <!--pc班型查询列表-->
     <select id="queryList" resultType="com.miaxis.school.vo.SchoolClassTypePcVO">
         SELECT
-        s.`id`,
-        s.`class_name` as className,
-        s.`total_price` as totalPrice,
-        s.`train`,
-        s.`pxcx`,
-        s.`pay_type` AS payType,
-        s.`create_time` as createTime
+        sc.`id`,
+        sc.`class_name` as className,
+        sc.`total_price` as totalPrice,
+        sc.`train`,
+        sc.`pxcx`,
+        sc.`pay_type` AS payType,
+        sc.`create_time` as createTime
         FROM
-        school_class_type s
+        school_class_type sc
+        JOIN school_info s ON s.inscode = sc.inscode
         <where>
-            <if test="className != null  and className != ''"> and s.`class_name` like concat('%', #{className}, '%')</if>
-            <if test="totalPrice != null  and totalPrice != ''"> and s.total_price = #{totalPrice}</if>
-            <if test="train != null  and train != ''"> and s.train = #{train}</if>
-            <if test="payType != null  and payType != ''"> and s.pay_type = #{payType}</if>
-            <if test="pxcx != null  and pxcx != ''"> and s.pxcx = #{pxcx}</if>
+            <if test="className != null  and className != ''"> and sc.`class_name` like concat('%', #{className}, '%')</if>
+            <if test="totalPrice != null  and totalPrice != ''"> and sc.total_price = #{totalPrice}</if>
+            <if test="train != null  and train != ''"> and sc.train = #{train}</if>
+            <if test="payType != null  and payType != ''"> and sc.pay_type = #{payType}</if>
+            <if test="pxcx != null  and pxcx != ''"> and sc.pxcx = #{pxcx}</if>
         </where>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
     </select>
 
 </mapper>

hzgzpt-service/src/main/resources/mapper/school/SchoolInfoMapper.xml

@@ -246,6 +246,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM
         school_info s
         <where>
+            <if test="id != null  and id != ''"> and s.id = #{id}</if>
             <if test="inscode != null  and inscode != ''"> and s.inscode = #{inscode}</if>
             <if test="name != null  and name != ''"> and s.`name` like concat('%', #{name}, '%')</if>
             <if test="address != null  and address != ''"> and s.address = #{address}</if>
@@ -292,7 +293,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         s.`create_time` as createTime
         FROM
         school_info s
-        where s.`inscode` = #{inscode}
+        where s.`id` = #{id}
     </select>
 
     <!--pc删除驾校(逻辑删除)-->