zhizhi wu 5 years ago
parent
commit
8c6efd3375
  1. 7
      wisdomcar/src/main/java/com/ccsens/wisdomcar/persist/dao/StepDao.java
  2. 3
      wisdomcar/src/main/java/com/ccsens/wisdomcar/service/ProjectService.java
  3. 2
      wisdomcar/src/main/java/com/ccsens/wisdomcar/util/Constant.java
  4. 4
      wisdomcar/src/main/resources/application.yml
  5. 3
      wisdomcar/src/main/resources/mapper_dao/StepDao.xml

7
wisdomcar/src/main/java/com/ccsens/wisdomcar/persist/dao/StepDao.java

@ -21,4 +21,11 @@ public interface StepDao extends StepMapper {
StepVo.Step getCodeByStepOne();
String getRecordByCarIdAndType(@Param("carId") Long carId, @Param("type") byte type);
/**
* 查询最大序号
* @param stepType 类型
* @return 最大序号
*/
Integer getMaxSequence(@Param("stepType") byte stepType);
}

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

@ -77,7 +77,8 @@ public class ProjectService implements IProjectService {
// TODO 判断是否为结束结点
Step step = stepDao.selectByPrimaryKey(stepTask.getStepId());
if (true) {
Integer max = stepDao.getMaxSequence(Constant.STEP_TYPE_REAL);
if (step != null && max != null && step.getSequence() != null && step.getSequence().intValue() == max.intValue()) {
// 修改平车结束时间点
ProjectVo.BindCar bindCar = stepTaskDao.getBindCarTaskId(param.getTaskSubId());
if (bindCar == null) {

2
wisdomcar/src/main/java/com/ccsens/wisdomcar/util/Constant.java

@ -46,6 +46,8 @@ public class Constant {
public static final byte OPERATION_USER = 1;
/**数据来源:平车*/
public static final byte OPERATION_CAR = 0;
/**环节:真实*/
public static final byte STEP_TYPE_REAL = 0;
}

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

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

3
wisdomcar/src/main/resources/mapper_dao/StepDao.xml

@ -36,4 +36,7 @@
ORDER BY time DESC
limit 1
</select>
<select id="getMaxSequence" resultType="java.lang.Integer">
select max(sequence) from t_step where step_type = #{stepType} and rec_status = 0
</select>
</mapper>
Loading…
Cancel
Save