详情修改

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 = "驾校全国统一编号", 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/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;
@@ -88,14 +89,15 @@ public interface ISchoolInfoService extends IService<SchoolInfo>{
     /**
      * pc查询列表
      */
+    @DataScope(deptAlias ="s")
     List<SchoolInfoPcVO> queryList(SchoolInfoPcDTO schoolInfoPcDTO);
 
     /**
      * 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/SchoolInfoServiceImpl.java

@@ -133,12 +133,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"    />
@@ -38,6 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         s.`create_time` as createTime
         FROM
         school_class_type s
+        LEFT JOIN school_info si ON si.inscode = s.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>

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

@@ -232,7 +232,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <!-- pc驾校列表查询 -->
     <select id="queryList" resultType="com.miaxis.school.vo.SchoolInfoPcVO">
         SELECT
-        s.`id`,
+        s.`id` as dept_id,
         s.`inscode`,
         s.`name`,
         s.`sname`,
@@ -246,6 +246,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM
         school_info s
         <where>
+            <if test="deptId != null  and deptId != ''"> and s.id = #{deptId}</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删除驾校(逻辑删除)-->