add 添加获取学生维修技师接口

mec-biz/src/main/java/com/ym/mec/biz/dal/page/RepairStudentQueryInfo.java

@@ -24,6 +24,8 @@ public class RepairStudentQueryInfo extends QueryInfo {
 
     private Integer studentId;
 
+    private Integer payStatus;
+
     public Integer getSubjectId() {
         return subjectId;
     }
@@ -87,4 +89,12 @@ public class RepairStudentQueryInfo extends QueryInfo {
     public void setStudentId(Integer studentId) {
         this.studentId = studentId;
     }
+
+    public Integer getPayStatus() {
+        return payStatus;
+    }
+
+    public void setPayStatus(Integer payStatus) {
+        this.payStatus = payStatus;
+    }
 }

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

@@ -189,6 +189,9 @@
             <if test="repairStatus != null">
                 AND sr.repair_status_ = #{repairStatus}
             </if>
+            <if test="payStatus != null">
+                AND sr.pay_status_ = #{payStatus}
+            </if>
             <if test="startTime != null">
                 AND sr.create_time_ >= #{startTime}
             </if>
@@ -240,11 +243,11 @@
         SELECT su.real_name_ username_, su.id_ user_id_, su.avatar_ head_url_
         FROM music_group mg
                  LEFT JOIN student_registration sr on sr.music_group_id_ = mg.id_
-                 LEFT JOIN sys_user su ON su.id_ = sr.id_
+                 LEFT JOIN sys_user su ON su.id_ = sr.user_id_
         WHERE sr.user_id_ = #{studentId}
           AND mg.status_ = 'PROGRESS'
           AND mg.repair_user_id_ IS NOT NULL
-        ORDER BY id_ DESC
+        ORDER BY mg.id_ DESC
         LIMIT 1
     </select>
 

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

@@ -40,6 +40,7 @@ public class RepairController extends BaseController {
             return failed("用户信息获取失败");
         }
         queryInfo.setStudentId(sysUser.getId());
+        queryInfo.setPayStatus(2);
         return succeed(studentRepairService.queryPage(queryInfo));
     }
 
@@ -69,7 +70,7 @@ public class RepairController extends BaseController {
 
     @ApiOperation("获取维修技师信息")
     @PostMapping(value = "/getRepairer")
-    public HttpResponseResult getRepairer() throws Exception {
+    public HttpResponseResult getRepairer() {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             return failed(HttpStatus.FORBIDDEN, "请登录");

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

@@ -74,6 +74,7 @@ public class EduRepairController extends BaseController {
             return failed("用户信息获取失败");
         }
         queryInfo.setEmployeeId(sysUser.getId());
+        queryInfo.setPayStatus(2);
         return succeed(studentRepairService.queryPage(queryInfo));
     }