Browse Source

20210604v1.6

pt
zy_Java 5 years ago
parent
commit
e55388d59d
  1. 5
      wisdomcar/src/main/java/com/ccsens/wisdomcar/service/ProjectService.java
  2. 4
      wisdomcar/src/main/resources/application.yml

5
wisdomcar/src/main/java/com/ccsens/wisdomcar/service/ProjectService.java

@ -71,17 +71,16 @@ public class ProjectService implements IProjectService {
Long patientCarId = null; Long patientCarId = null;
ProjectVo.BindCar bindCar = stepTaskDao.getBindCarTaskId(stepTask.getTaskSubId()); ProjectVo.BindCar bindCar = stepTaskDao.getBindCarTaskId(stepTask.getTaskSubId());
if(ObjectUtil.isNotNull(bindCar)){ if(ObjectUtil.isNotNull(bindCar)){
patientCarId = bindCar.getCarId(); patientCarId = bindCar.getId();
} }
// 判断是否为结束结点 // 判断是否为结束结点
Step step = stepDao.selectByPrimaryKey(stepTask.getStepId()); Step step = stepDao.selectByPrimaryKey(stepTask.getStepId());
Integer max = stepDao.getMaxSequence(Constant.STEP_TYPE_REAL); Integer max = stepDao.getMaxSequence(Constant.STEP_TYPE_REAL);
if (step != null && max != null && step.getSequence() != null && step.getSequence().intValue() == max.intValue()) { if (step != null && max != null && step.getSequence() != null && step.getSequence().intValue() == max.intValue()) {
// 修改平车结束时间点 // 修改平车结束时间点
boolean needModifyEndTime = bindCar != null && (bindCar.getEndTime() == null || bindCar.getEndTime() == 0); boolean needModifyEndTime = bindCar != null && (bindCar.getEndTime() == null || bindCar.getEndTime() == 0);
if (needModifyEndTime) { if (needModifyEndTime) {
log.info("出现异常,未找到绑定平车:{}", stepTask.getTaskSubId()); // log.info("出现异常,未找到绑定平车:{}", stepTask.getTaskSubId());
PatientWisdomCar patientWisdomCar = new PatientWisdomCar(); PatientWisdomCar patientWisdomCar = new PatientWisdomCar();
patientWisdomCar.setId(bindCar.getId()); patientWisdomCar.setId(bindCar.getId());
patientWisdomCar.setEndTime(startTime); patientWisdomCar.setEndTime(startTime);

4
wisdomcar/src/main/resources/application.yml

@ -1,6 +1,6 @@
spring: spring:
profiles: profiles:
active: dev active: prod
include: common, util-dev include: common, util-prod

Loading…
Cancel
Save