diff --git a/casic-metering-api/src/main/resources/config/application-dev.yml b/casic-metering-api/src/main/resources/config/application-dev.yml index 080712e..eed1b51 100644 --- a/casic-metering-api/src/main/resources/config/application-dev.yml +++ b/casic-metering-api/src/main/resources/config/application-dev.yml @@ -41,4 +41,4 @@ level.root: info level.com.casic: debug level.org.springframework.web: info - level.org.flowable: debug #flowable日志,可查看SQL执行 \ No newline at end of file +# level.org.flowable: debug #flowable日志,可查看SQL执行 \ No newline at end of file diff --git a/casic-metering-api/src/main/resources/config/application-dev.yml b/casic-metering-api/src/main/resources/config/application-dev.yml index 080712e..eed1b51 100644 --- a/casic-metering-api/src/main/resources/config/application-dev.yml +++ b/casic-metering-api/src/main/resources/config/application-dev.yml @@ -41,4 +41,4 @@ level.root: info level.com.casic: debug level.org.springframework.web: info - level.org.flowable: debug #flowable日志,可查看SQL执行 \ No newline at end of file +# level.org.flowable: debug #flowable日志,可查看SQL执行 \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java index ad81deb..39ddf01 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java @@ -267,9 +267,9 @@ QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("sample_id", deviceStatusChangeDTO.getSampleId()); queryWrapper.eq("order_id", deviceStatusChangeDTO.getOrderId()); - queryWrapper.and(QueryWrapper -> QueryWrapper.eq("measure_status", TO_ALLOCATE) + queryWrapper.and(QueryWrapper -> QueryWrapper.eq("measure_status", MeasureStatusEnum.TO_ALLOCATE) .or().eq("measure_status", MeasureStatusEnum.TO_MEASURE) - .or().eq("measure_status", IN_MEASURE)); + .or().eq("measure_status", MeasureStatusEnum.IN_MEASURE)); BusinessLabExecutiveInfo businessLabExecutiveInfo = new BusinessLabExecutiveInfo(); businessLabExecutiveInfo.setMeasureStatus(measureStatus); businessLabExecutiveInfo.setRemark(deviceStatusChangeDTO.getReason());