|
|
@@ -6,7 +6,6 @@ import cn.com.ty.lift.business.evaluation.dao.entity.Evaluation;
|
|
|
import cn.com.ty.lift.business.evaluation.service.EvaluationService;
|
|
|
import cn.com.ty.lift.business.framework.util.MessageUtils;
|
|
|
import cn.com.ty.lift.business.library.dao.entity.Lift;
|
|
|
-import cn.com.ty.lift.business.library.dao.entity.PlatformCompanyLiftRelevance;
|
|
|
import cn.com.ty.lift.business.library.service.LiftService;
|
|
|
import cn.com.ty.lift.business.library.service.PlatformCompanyLiftRelevanceService;
|
|
|
import cn.com.ty.lift.business.maintenance.dao.entity.*;
|
|
|
@@ -741,14 +740,14 @@ public class MaintenanceRecordService extends ServiceImpl<MaintenanceRecordMappe
|
|
|
//更新状态 - 维保记录
|
|
|
record.setMaintenanceOption(request.getMaintenanceOption());
|
|
|
record.setStatus(CommonEnum.MaintenanceRecordStatus.COMPLETE.getCode());
|
|
|
- record.setWorkDate(LocalDateTime.now());
|
|
|
+// record.setWorkDate(LocalDateTime.now());
|
|
|
boolean mr = saveOrUpdate(record);
|
|
|
if (!mr) {
|
|
|
return RestResponse.fail("修改保养单失败，请稍后重试");
|
|
|
}
|
|
|
//更新状态 - 维保计划
|
|
|
plan.setStatus(Integer.parseInt(CommonEnum.MaintenancePlanStatus.COMPLETE.getCode()));
|
|
|
- plan.setWorkDate(LocalDateTime.now());
|
|
|
+ plan.setWorkDate(record.getWorkDate());
|
|
|
if (!maintenancePlanService.updateById(plan)) {
|
|
|
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
|
|
|
return RestResponse.fail("更新保养计划失败，请稍后重试");
|
yang