From e55388d59dc68a5209a55060c5034bd297b06f81 Mon Sep 17 00:00:00 2001
From: zy_Java <654600784@qq.com>
Date: Fri, 4 Jun 2021 21:28:04 +0800
Subject: [PATCH] 20210604v1.6

---
 .../java/com/ccsens/wisdomcar/service/ProjectService.java    | 5 ++---
 wisdomcar/src/main/resources/application.yml                 | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/ProjectService.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/ProjectService.java
index 691e892d..81038f85 100644
--- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/ProjectService.java
+++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/ProjectService.java
@@ -71,17 +71,16 @@ public class ProjectService implements IProjectService {
         Long patientCarId = null;
         ProjectVo.BindCar bindCar = stepTaskDao.getBindCarTaskId(stepTask.getTaskSubId());
         if(ObjectUtil.isNotNull(bindCar)){
-            patientCarId = bindCar.getCarId();
+            patientCarId = bindCar.getId();
         }
         // 判断是否为结束结点
         Step step = stepDao.selectByPrimaryKey(stepTask.getStepId());
         Integer max = stepDao.getMaxSequence(Constant.STEP_TYPE_REAL);
         if (step != null && max != null && step.getSequence() != null && step.getSequence().intValue() == max.intValue()) {
-
             // 修改平车结束时间点
             boolean needModifyEndTime = bindCar != null && (bindCar.getEndTime() == null || bindCar.getEndTime() == 0);
             if (needModifyEndTime) {
-                log.info("出现异常，未找到绑定平车：{}", stepTask.getTaskSubId());
+//                log.info("出现异常，未找到绑定平车：{}", stepTask.getTaskSubId());
                 PatientWisdomCar patientWisdomCar = new PatientWisdomCar();
                 patientWisdomCar.setId(bindCar.getId());
                 patientWisdomCar.setEndTime(startTime);
diff --git a/wisdomcar/src/main/resources/application.yml b/wisdomcar/src/main/resources/application.yml
index a47f2a7b..1ac895fc 100644
--- a/wisdomcar/src/main/resources/application.yml
+++ b/wisdomcar/src/main/resources/application.yml
@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: dev
-    include: common, util-dev
+    active: prod
+    include: common, util-prod