Merge branch 'maintenance_feature'

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

@@ -26,6 +26,7 @@ public interface StudentInstrumentDao extends BaseDAO<Long, StudentInstrument> {
 
     /**
      * 根据服务结束时间获取列表
+     *
      * @param startTime
      * @param endTime
      * @return
@@ -34,8 +35,16 @@ public interface StudentInstrumentDao extends BaseDAO<Long, StudentInstrument> {
 
     /**
      * 获取学生乐器信息
+     *
      * @param orderId
      * @return
      */
     StudentInstrument getByOrderId(Long orderId);
+
+    /**
+     * 获取学生的乐器信息
+     *
+     * @return
+     */
+    StudentInstrument getStudentInstrument(@Param("studentId") Integer studentId, @Param("goodsId") Integer goodsId);
 }

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

@@ -63,4 +63,13 @@ public interface StudentInstrumentService extends BaseService<Long, StudentInstr
      */
     Boolean subjectChangeUpdateInstrument(SubjectChange subjectChange);
 
+
+    /**
+     * 获取学生的乐器信息
+     * @param studentId
+     * @param goodsId
+     * @return
+     */
+    StudentInstrument getStudentInstrument(Integer studentId,Integer goodsId);
+
 }

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

@@ -369,4 +369,9 @@ public class StudentInstrumentServiceImpl extends BaseServiceImpl<Long, StudentI
         updateStudentInstrument(studentInstrument);
         return true;
     }
+
+    @Override
+    public StudentInstrument getStudentInstrument(Integer studentId,Integer goodsId) {
+        return studentInstrumentDao.getStudentInstrument(studentId,goodsId);
+    }
 }

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

@@ -182,4 +182,8 @@
         WHERE change_order_id_ = #{orderId}
     </select>
 
+    <select id="getStudentInstrument" resultMap="StudentInstrument">
+        SELECT * FROM student_instrument WHERE student_id_ = #{studentId} AND goods_id_ = #{goodsId} AND del_flag_ = 0
+    </select>
+
 </mapper>

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

@@ -4,10 +4,8 @@ package com.ym.mec.web.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.dao.StudentDao;
 import com.ym.mec.biz.dal.dao.StudentInstrumentDao;
 import com.ym.mec.biz.dal.entity.Employee;
-import com.ym.mec.biz.dal.entity.Goods;
 import com.ym.mec.biz.dal.entity.StudentInstrument;
 import com.ym.mec.biz.dal.page.StudentInstrumentQueryInfo;
 import com.ym.mec.biz.service.StudentInstrumentService;
@@ -81,6 +79,11 @@ public class StudentInstrumentController extends BaseController {
         if (studentInstrument.getStudentId() == null) {
             return failed("学生id不能为空");
         }
+        StudentInstrument oldInstrument = studentInstrumentService.getStudentInstrument(studentInstrument.getStudentId(), studentInstrument.getGoodsId());
+        if (oldInstrument != null) {
+            return failed("学生乐器信息已存在，请核查");
+        }
+
         Date nowDate = new Date();
         //不是乐保
         if (studentInstrument.getStatus().equals(0)) {