|
@@ -164,7 +164,7 @@ public class StudentRepairServiceImpl extends BaseServiceImpl<Integer, StudentRe
|
|
|
|
|
|
@Override
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
- public void repairSuccess(Integer id, String description,Integer repairStatus) {
|
|
|
+ public void repairSuccess(Integer id, String description, Integer repairStatus) {
|
|
|
SysUser sysUser = sysUserFeignService.queryUserInfo();
|
|
|
if (sysUser == null) {
|
|
|
throw new BizException("用户信息获取失败");
|
|
@@ -173,7 +173,7 @@ public class StudentRepairServiceImpl extends BaseServiceImpl<Integer, StudentRe
|
|
|
if (studentRepair == null) {
|
|
|
throw new BizException("维修信息不存在");
|
|
|
}
|
|
|
- if(repairStatus != null){
|
|
|
+ if (repairStatus != null) {
|
|
|
studentRepair.setRepairStatus(1);
|
|
|
studentRepair.setFinishTime(new Date());
|
|
|
}
|
|
@@ -196,11 +196,11 @@ public class StudentRepairServiceImpl extends BaseServiceImpl<Integer, StudentRe
|
|
|
@Override
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
public Map payRepair(StudentRepair repairInfo) throws Exception {
|
|
|
- if(repairInfo.getSendType().equals(1) &&
|
|
|
- (repairInfo.getContactName() ==null ||repairInfo.getContactName().isEmpty()) &&
|
|
|
- (repairInfo.getContactMobile() ==null ||repairInfo.getContactMobile().isEmpty()) &&
|
|
|
- (repairInfo.getAddress() ==null ||repairInfo.getAddress().isEmpty())
|
|
|
- ){
|
|
|
+ if (repairInfo.getSendType().equals(1) &&
|
|
|
+ (repairInfo.getContactName() == null || repairInfo.getContactName().isEmpty()) &&
|
|
|
+ (repairInfo.getContactMobile() == null || repairInfo.getContactMobile().isEmpty()) &&
|
|
|
+ (repairInfo.getAddress() == null || repairInfo.getAddress().isEmpty())
|
|
|
+ ) {
|
|
|
throw new BizException("邮寄信息必填");
|
|
|
}
|
|
|
Date date = new Date();
|
|
@@ -278,8 +278,12 @@ public class StudentRepairServiceImpl extends BaseServiceImpl<Integer, StudentRe
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public BasicUserDto getRepairer(Integer studentId) {
|
|
|
- return null;
|
|
|
+ public BasicUserDto getStudentRepairer(Integer studentId, Integer organId) {
|
|
|
+ BasicUserDto repairer = studentRepairDao.getStudentMusicGroupRepairer(studentId);
|
|
|
+ if (repairer == null) {
|
|
|
+ repairer = studentRepairDao.getStudentOrganRepairer(organId);
|
|
|
+ }
|
|
|
+ return repairer;
|
|
|
}
|
|
|
|
|
|
}
|