add 教务端增加添加维修

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/StudentRepairDao.java

@@ -42,4 +42,11 @@ public interface StudentRepairDao extends com.ym.mec.common.dal.BaseDAO<Integer,
       * @return
       */
      BasicUserDto getStudentInfo(@Param("studentId") Integer studentId);
+
+     /**
+      * 获取维修单信息
+      * @param id
+      * @return
+      */
+     StudentRepair getRepairInfo(@Param("id") Integer id);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/StudentRepair.java

@@ -43,11 +43,21 @@ public class StudentRepair {
     private Integer employeeId;
 
     /**
-    * 技师名字
-    */
+     * 技师名字
+     */
     private String employeeName;
 
     /**
+     * 技师电话
+     */
+    private String employeePhone;
+
+    /**
+     * 技师联系地址
+     */
+    private String employeeAddress;
+
+    /**
     * 乐器类型id
     */
     private Integer subjectId;
@@ -313,4 +323,20 @@ public class StudentRepair {
     public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
     }
+
+    public String getEmployeePhone() {
+        return employeePhone;
+    }
+
+    public void setEmployeePhone(String employeePhone) {
+        this.employeePhone = employeePhone;
+    }
+
+    public String getEmployeeAddress() {
+        return employeeAddress;
+    }
+
+    public void setEmployeeAddress(String employeeAddress) {
+        this.employeeAddress = employeeAddress;
+    }
 }

mec-biz/src/main/java/com/ym/mec/biz/service/StudentRepairService.java

@@ -38,4 +38,11 @@ public interface StudentRepairService extends BaseService<Integer, StudentRepair
      * @return
      */
     BasicUserDto getStudentInfo(Integer studentId);
+
+    /**
+     * 获取维修单详情
+     * @param id
+     * @return
+     */
+    StudentRepair getRepairInfo(Integer id);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentRepairServiceImpl.java

@@ -183,7 +183,12 @@ public class StudentRepairServiceImpl extends BaseServiceImpl<Integer, StudentRe
 
     @Override
     public BasicUserDto getStudentInfo(Integer studentId) {
-        return null;
+        return studentRepairDao.getStudentInfo(studentId);
+    }
+
+    @Override
+    public StudentRepair getRepairInfo(Integer id) {
+        return studentRepairDao.getRepairInfo(id);
     }
 
 }

mec-biz/src/main/resources/config/mybatis/StudentRepairMapper.xml

@@ -11,6 +11,8 @@
         <result column="student_school_" jdbcType="VARCHAR" property="studentSchool"/>
         <result column="employee_id_" jdbcType="INTEGER" property="employeeId"/>
         <result column="employee_name_" jdbcType="VARCHAR" property="employeeName"/>
+        <result column="employee_phone_" jdbcType="VARCHAR" property="employeePhone"/>
+        <result column="employee_address_" jdbcType="VARCHAR" property="employeeAddress"/>
         <result column="subject_id_" jdbcType="INTEGER" property="subjectId"/>
         <result column="subject_name_" jdbcType="VARCHAR" property="subjectName"/>
         <result column="type_" jdbcType="INTEGER" property="type"/>
@@ -29,9 +31,7 @@
     </resultMap>
     <!-- 根据主键查询一条记录 -->
     <select id="get" resultMap="StudentRepair">
-        SELECT *
-        FROM school
-        WHERE id_ = #{id}
+        SELECT * FROM student_repair WHERE id_=#{id}
     </select>
 
     <insert id="insert" parameterType="com.ym.mec.biz.dal.entity.StudentRepair" useGeneratedKeys="true" keyColumn="id"
@@ -212,10 +212,25 @@
         ORDER BY id_ DESC
     </select>
     <select id="getStudentInfo" resultMap="com.ym.mec.biz.dal.dao.MusicGroupDao.BasicUserDto">
-        SELECT su.username_ ,su.id_ user_id_,su.avatar_ head_url_,su.gender_,mg.id_ music_group_id_,mg.name_ music_group_name_,sr.subject_id_  FROM sys_user su
-        LEFT JOIN student_registration sr ON sr.user_id_ = su.id_
-        LEFT JOIN music_group mg ON mg.id_ = sr.music_group_id_
+        SELECT su.username_,
+               su.id_     user_id_,
+               su.avatar_ head_url_,
+               su.gender_,
+               mg.id_     music_group_id_,
+               mg.name_   music_group_name_,
+               sr.subject_id_
+        FROM sys_user su
+                 LEFT JOIN student_registration sr ON sr.user_id_ = su.id_
+                 LEFT JOIN music_group mg ON mg.id_ = sr.music_group_id_
         WHERE su.id_ = #{studentId}
-        ORDER BY mg.id_ DESC LIMIT 1
+        ORDER BY mg.id_ DESC
+        LIMIT 1
+    </select>
+
+    <select id="getRepairInfo" resultMap="StudentRepair">
+        SELECT sr.*,su.phone_ employee_phone_,e.contact_address_ employee_address_ FROM student_repair sr
+        LEFT JOIN sys_user su ON su.id_=sr.employee_id_
+        LEFT JOIN employee e ON sr.employee_id_ = e.user_id_
+        WHERE sr.id_ = #{id}
     </select>
 </mapper>

mec-student/src/main/java/com/ym/mec/student/controller/RepairController.java

@@ -43,5 +43,19 @@ public class RepairController extends BaseController {
         return succeed(studentRepairService.queryPage(queryInfo));
     }
 
+    @ApiOperation("获取维修记录详情")
+    @GetMapping(value = "/getRepairInfo")
+    public HttpResponseResult getRepairInfo(Integer id) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            return failed("用户信息获取失败");
+        }
+        StudentRepair repairInfo = studentRepairService.getRepairInfo(id);
+        if (!repairInfo.getStudentId().equals(sysUser.getId())) {
+            return failed("您的维修记录不存在");
+        }
+        return succeed(repairInfo);
+    }
+
 
 }

mec-web/src/main/java/com/ym/mec/web/controller/education/EduRepairController.java

@@ -94,8 +94,17 @@ public class EduRepairController extends BaseController {
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
-        return succeed(subjectService.findSubSubjects(1));
+        return succeed(studentRepairService.getStudentInfo(studentId));
     }
 
+    @ApiOperation("获取维修记录详情")
+    @GetMapping(value = "/getRepairInfo")
+    public HttpResponseResult getRepairInfo(Integer id) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            return failed("用户信息获取失败");
+        }
+        return succeed(studentRepairService.getRepairInfo(id));
+    }
 
 }