瀏覽代碼

Merge branch 'develop' of http://132.232.206.88:3000/lift-manager/lift-server into huangyuan-user

黄远 5 年之前
父節點
當前提交
7dfbea44fe

+ 1 - 1
lift-business-service/src/main/java/cn/com/ty/lift/business/framework/job/BusinessJob.java

@@ -89,7 +89,7 @@ public class BusinessJob {
     /**
      * 批量更新项目状态
      */
-    @Scheduled(cron = "0 */5 * * * ?")
+    @Scheduled(cron = "0 0 0 * * ?")
     public void sendMessageModifyStatus() {
         log.info("开始执行批量更新项目状态");
         List<Project> projects = projectService.queryProjectList();

+ 1 - 1
lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/service/MaintenanceRecordService.java

@@ -175,7 +175,7 @@ public class MaintenanceRecordService extends ServiceImpl<MaintenanceRecordMappe
         if (!result){
             return RestResponse.fail(MessageUtils.get("msg.modify.fail"));
         }
-        MaintenancePlan plan = maintenancePlanService.getOne(record.getMtPlanId());
+        MaintenancePlan plan = maintenancePlanService.getOne(oldRecord.getMtPlanId());
         if (ObjectUtil.isEmpty(plan)) return RestResponse.fail(MessageUtils.get("msg.modify.fail"));
         plan.setStatus(Integer.parseInt(CommonEnum.MaintenancePlanStatus.COMPLETE.getCode()));
         plan.setWorkDate(LocalDate.now());