Merge remote-tracking branch 'origin/master'

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

@@ -116,6 +116,14 @@ public class StudentRepair {
     */
     private Date updateTime;
 
+    public Integer getRepairStatus() {
+        return repairStatus;
+    }
+
+    public void setRepairStatus(Integer repairStatus) {
+        this.repairStatus = repairStatus;
+    }
+
     public Integer getId() {
         return id;
     }

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

@@ -12,14 +12,18 @@ public class RepairStudentQueryInfo extends QueryInfo {
 
     private Integer subjectId;
 
+    //维修类型 0-线下 1-线上
     private Integer type;
 
+    //'0维修中，1已完成'
     private Integer repairStatus;
 
     private Date startTime;
 
     private Date endTime;
 
+    private Integer studentId;
+
     public Integer getSubjectId() {
         return subjectId;
     }
@@ -75,4 +79,12 @@ public class RepairStudentQueryInfo extends QueryInfo {
     public void setOrganIdList(String organIdList) {
         this.organIdList = organIdList;
     }
+
+    public Integer getStudentId() {
+        return studentId;
+    }
+
+    public void setStudentId(Integer studentId) {
+        this.studentId = studentId;
+    }
 }

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

@@ -23,4 +23,12 @@ public interface StudentRepairService extends BaseService<Integer, StudentRepair
      * @return
      */
    Map addRepair(StudentRepair repairInfo) throws Exception;
+
+
+    /**
+     * 维修完成
+     * @param id
+     * @param description
+     */
+    void repairSuccess(Integer id, String description);
 }

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

@@ -1,16 +1,15 @@
 package com.ym.mec.biz.service.impl;
 
+import com.ym.mec.auth.api.client.SysUserFeignService;
+import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.StudentRepairDao;
 import com.ym.mec.biz.dal.dao.SysConfigDao;
 import com.ym.mec.biz.dal.dto.BasicUserDto;
 import com.ym.mec.biz.dal.entity.StudentPaymentOrder;
 import com.ym.mec.biz.dal.entity.StudentRepair;
-import com.ym.mec.biz.dal.entity.SysConfig;
-import com.ym.mec.biz.dal.entity.SysUserCashAccount;
 import com.ym.mec.biz.dal.enums.DealStatusEnum;
 import com.ym.mec.biz.dal.enums.GroupType;
 import com.ym.mec.biz.dal.enums.OrderTypeEnum;
-import com.ym.mec.biz.dal.enums.PlatformCashAccountDetailTypeEnum;
 import com.ym.mec.biz.dal.page.RepairStudentQueryInfo;
 import com.ym.mec.biz.service.PayService;
 import com.ym.mec.biz.service.StudentPaymentOrderService;
@@ -22,6 +21,8 @@ import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.IdGeneratorService;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.util.collection.MapUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -31,10 +32,12 @@ import java.util.*;
 
 @Service
 public class StudentRepairServiceImpl extends BaseServiceImpl<Integer, StudentRepair> implements StudentRepairService {
-
+    private static final Logger log = LoggerFactory.getLogger(StudentRepairServiceImpl.class);
     @Autowired
     private StudentRepairDao studentRepairDao;
     @Autowired
+    private SysUserFeignService sysUserFeignService;
+    @Autowired
     private PayService payService;
     @Autowired
     private IdGeneratorService idGeneratorService;
@@ -137,4 +140,23 @@ public class StudentRepairServiceImpl extends BaseServiceImpl<Integer, StudentRe
         studentPaymentOrderService.update(studentPaymentOrder);
         return payMap;
     }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void repairSuccess(Integer id, String description) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            throw new BizException("用户信息获取失败");
+        }
+        StudentRepair studentRepair = studentRepairDao.get(id);
+        if(studentRepair == null){
+            throw new BizException("维修信息不存在");
+        }
+        studentRepair.setRepairStatus(1);
+        studentRepair.setUpdateTime(new Date());
+        studentRepair.setDescription(description);
+        studentRepairDao.update(studentRepair);
+        log.info("操作人 :" + sysUser.getId());
+    }
+
 }

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

@@ -169,6 +169,9 @@
             <if test="employeeId != null">
                 AND sr.employee_id_ = #{employeeId}
             </if>
+            <if test="studentId != null">
+                AND sr.student_id_ = #{studentId}
+            </if>
             <if test="organIdList != null">
                 AND FIND_IN_SET(sr.organ_id_,#{organIdList})
             </if>

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

@@ -0,0 +1,47 @@
+package com.ym.mec.student.controller;
+
+
+import com.ym.mec.auth.api.client.SysUserFeignService;
+import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.dao.EmployeeDao;
+import com.ym.mec.biz.dal.entity.Employee;
+import com.ym.mec.biz.dal.entity.StudentRepair;
+import com.ym.mec.biz.dal.page.RepairStudentQueryInfo;
+import com.ym.mec.biz.service.StudentRepairService;
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.entity.HttpResponseResult;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Objects;
+
+@RequestMapping("repair")
+@Api(tags = "学生维修服务")
+@RestController
+public class RepairController extends BaseController {
+
+    @Autowired
+    private SysUserFeignService sysUserFeignService;
+
+    @Autowired
+    private StudentRepairService studentRepairService;
+
+    @ApiOperation("获取维修记录")
+    @GetMapping(value = "/getStudentRepairList")
+    public HttpResponseResult getStudentRepairList(RepairStudentQueryInfo queryInfo) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            return failed("用户信息获取失败");
+        }
+        queryInfo.setStudentId(sysUser.getId());
+        return succeed(studentRepairService.queryPage(queryInfo));
+    }
+
+
+}

mec-web/src/main/java/com/ym/mec/web/controller/EmployeeController.java

@@ -148,6 +148,7 @@ public class EmployeeController extends BaseController {
 
     @ApiOperation(value = "获取维修技师")
     @GetMapping("/findTechnician")
+    @PreAuthorize("@pcs.hasPermissions('employee/findTechnician')")
     public HttpResponseResult findTechnician(){
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         String organIds=new String();

mec-web/src/main/java/com/ym/mec/web/controller/StudentRepairController.java

@@ -14,6 +14,7 @@ import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -36,6 +37,7 @@ public class StudentRepairController extends BaseController {
 
     @ApiOperation("获取维修列表")
     @GetMapping(value = "/queryPage")
+    @PreAuthorize("@pcs.hasPermissions('studentRepair/queryPage')")
     public HttpResponseResult queryPage(RepairStudentQueryInfo queryInfo) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
@@ -56,4 +58,13 @@ public class StudentRepairController extends BaseController {
         }
         return succeed(studentRepairService.queryPage(queryInfo));
     }
+
+
+    @ApiOperation("维修完成")
+    @GetMapping(value = "/repairSuccess")
+    @PreAuthorize("@pcs.hasPermissions('studentRepair/repairSuccess')")
+    public HttpResponseResult repairSuccess(Integer id,String description) {
+        studentRepairService.repairSuccess(id,description);
+        return succeed();
+    }
 }

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

@@ -13,6 +13,7 @@ import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.exception.BizException;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -20,6 +21,8 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Arrays;
+import java.util.List;
 import java.util.Objects;
 
 @RequestMapping("eduRepair")
@@ -64,5 +67,16 @@ public class EduRepairController extends BaseController {
         return succeed(studentRepairService.addRepair(repairInfo));
     }
 
+    @ApiOperation("获取学生的维修记录")
+    @GetMapping(value = "/getStudentRepairList")
+    public HttpResponseResult getStudentRepairList(RepairStudentQueryInfo queryInfo) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            return failed("用户信息获取失败");
+        }
+        queryInfo.setEmployeeId(sysUser.getId());
+        return succeed(studentRepairService.queryPage(queryInfo));
+    }
+
 
 }