|
|
@@ -886,20 +886,23 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
|
|
|
|
|
|
RepairApplicationForm applicationForm = mapper.selectById(dto.getId());
|
|
|
// 判断时间是否先后顺序
|
|
|
- if(applicationForm.getApplyTime().isAfter(dto.getRepairStartTime())){
|
|
|
+ if(dto.getApplyTime().isAfter(dto.getRepairStartTime())){
|
|
|
throw new BusinessException("报修时间不可晚于接收时间，请重新设置时间.");
|
|
|
}
|
|
|
- if(applicationForm.getApplyTime().isAfter(dto.getRepairEndTime())){
|
|
|
+ if(dto.getApplyTime().isAfter(dto.getRepairEndTime())){
|
|
|
throw new BusinessException("报修时间不可晚于完成时间，请重新设置时间.");
|
|
|
}
|
|
|
if(dto.getRepairStartTime().isAfter(dto.getRepairEndTime())){
|
|
|
throw new BusinessException("接收时间不可晚于完成时间，请重新设置时间.");
|
|
|
}
|
|
|
+ applicationForm.setCategory(dto.getCategory());
|
|
|
+ applicationForm.setRepairStartTime(dto.getRepairStartTime());
|
|
|
+ applicationForm.setRepairEndTime(dto.getRepairEndTime());
|
|
|
applicationForm.setReceiveMinutes(DateUtils.getDurationHours(applicationForm.getApplyTime(), dto.getRepairStartTime()));
|
|
|
applicationForm.setRepairMinutes(DateUtils.getDurationHours(dto.getRepairStartTime(), dto.getRepairEndTime()));
|
|
|
applicationForm.setDealMinutes(DateUtils.getDurationHours(applicationForm.getApplyTime(), dto.getRepairEndTime()));
|
|
|
applicationForm.setCategory(dto.getCategory());
|
|
|
- super.modModelByPrimaryKey(applicationForm);
|
|
|
+ mapper.updateByPrimaryKeySelective(applicationForm);
|
|
|
|
|
|
}
|
|
|
|
