diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CurrentSegmentEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CurrentSegmentEnum.java index 8c9803a..1c778b3 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CurrentSegmentEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CurrentSegmentEnum.java @@ -7,6 +7,8 @@ */ public interface CurrentSegmentEnum { String TO_ALLOCATE = "待分配"; + + String EARNED_INCOME = "已收入"; String TO_INCOME = "待收入"; String COMPLETE = "完成"; String OUT_UNDERTAKE = "外包"; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CurrentSegmentEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CurrentSegmentEnum.java index 8c9803a..1c778b3 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CurrentSegmentEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CurrentSegmentEnum.java @@ -7,6 +7,8 @@ */ public interface CurrentSegmentEnum { String TO_ALLOCATE = "待分配"; + + String EARNED_INCOME = "已收入"; String TO_INCOME = "待收入"; String COMPLETE = "完成"; String OUT_UNDERTAKE = "外包"; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java index fac192e..87bffe5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java @@ -317,9 +317,9 @@ queryWrapper.like(ObjectUtil.isNotEmpty(request.getStatus()) && request.getStatus() != 0, "status", request.getStatus()); queryWrapper.eq("is_del", 0); queryWrapper.apply(StringUtils.isNotBlank(request.getStartTime()), - "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getStartTime()); + "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getStartTime()); queryWrapper.apply(StringUtils.isNotBlank(request.getEndTime()), - "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getEndTime()); + "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getEndTime()); queryWrapper.orderByDesc("create_time"); return queryWrapper; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CurrentSegmentEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CurrentSegmentEnum.java index 8c9803a..1c778b3 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CurrentSegmentEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CurrentSegmentEnum.java @@ -7,6 +7,8 @@ */ public interface CurrentSegmentEnum { String TO_ALLOCATE = "待分配"; + + String EARNED_INCOME = "已收入"; String TO_INCOME = "待收入"; String COMPLETE = "完成"; String OUT_UNDERTAKE = "外包"; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java index fac192e..87bffe5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java @@ -317,9 +317,9 @@ queryWrapper.like(ObjectUtil.isNotEmpty(request.getStatus()) && request.getStatus() != 0, "status", request.getStatus()); queryWrapper.eq("is_del", 0); queryWrapper.apply(StringUtils.isNotBlank(request.getStartTime()), - "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getStartTime()); + "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getStartTime()); queryWrapper.apply(StringUtils.isNotBlank(request.getEndTime()), - "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getEndTime()); + "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getEndTime()); queryWrapper.orderByDesc("create_time"); return queryWrapper; 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 50dd5f6..0abc392 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 @@ -228,7 +228,7 @@ * 进行已收入分页的当前环节回填、出具证书回填 */ private void doDispatchVoPopulation(DeviceDispatchVO dispatchVO, Long sampleId, Long orderId) { - dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_INCOME); + dispatchVO.setCurrentSegment(EARNED_INCOME); HandOutLabExecutiveDTO handOutLabExecutiveDTO = getHandOutLabExecutiveDTO(orderId, sampleId); Integer measureNumberStatus = labExecutiveInfoMapper.getMeasureNumberStatus(orderId, sampleId); //证书，当前环节的回填 @@ -253,9 +253,9 @@ QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("sample_id", deviceStatusChangeDTO.getSampleId()); queryWrapper.eq("order_id", deviceStatusChangeDTO.getOrderId()); - queryWrapper.and(QueryWrapper -> QueryWrapper.eq("measure_status", MeasureStatusEnum.TO_ALLOCATE) + queryWrapper.and(QueryWrapper -> QueryWrapper.eq("measure_status", TO_ALLOCATE) .or().eq("measure_status", MeasureStatusEnum.TO_MEASURE) - .or().eq("measure_status", MeasureStatusEnum.IN_MEASURE)); + .or().eq("measure_status", IN_MEASURE)); BusinessLabExecutiveInfo businessLabExecutiveInfo = new BusinessLabExecutiveInfo(); businessLabExecutiveInfo.setMeasureStatus(measureStatus); businessLabExecutiveInfo.setRemark(deviceStatusChangeDTO.getReason()); @@ -280,9 +280,9 @@ QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.eq("sample_id", deviceStatusChangeDTO.getSampleId()); queryWrapper.eq("order_id", deviceStatusChangeDTO.getOrderId()); - queryWrapper.and(QueryWrapper -> QueryWrapper.eq("measure_status", MeasureStatusEnum.TO_ALLOCATE) + queryWrapper.and(QueryWrapper -> QueryWrapper.eq("measure_status", TO_ALLOCATE) .or().eq("measure_status", MeasureStatusEnum.TO_MEASURE) - .or().eq("measure_status", MeasureStatusEnum.IN_MEASURE)); + .or().eq("measure_status",IN_MEASURE)); List businessLabExecutiveInfo = labExecutiveInfoMapper.selectList(queryWrapper); return businessLabExecutiveInfo.isEmpty() ? null : businessLabExecutiveInfo.get(0); } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CurrentSegmentEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CurrentSegmentEnum.java index 8c9803a..1c778b3 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CurrentSegmentEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CurrentSegmentEnum.java @@ -7,6 +7,8 @@ */ public interface CurrentSegmentEnum { String TO_ALLOCATE = "待分配"; + + String EARNED_INCOME = "已收入"; String TO_INCOME = "待收入"; String COMPLETE = "完成"; String OUT_UNDERTAKE = "外包"; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java index fac192e..87bffe5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java @@ -317,9 +317,9 @@ queryWrapper.like(ObjectUtil.isNotEmpty(request.getStatus()) && request.getStatus() != 0, "status", request.getStatus()); queryWrapper.eq("is_del", 0); queryWrapper.apply(StringUtils.isNotBlank(request.getStartTime()), - "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getStartTime()); + "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getStartTime()); queryWrapper.apply(StringUtils.isNotBlank(request.getEndTime()), - "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getEndTime()); + "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getEndTime()); queryWrapper.orderByDesc("create_time"); return queryWrapper; 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 50dd5f6..0abc392 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 @@ -228,7 +228,7 @@ * 进行已收入分页的当前环节回填、出具证书回填 */ private void doDispatchVoPopulation(DeviceDispatchVO dispatchVO, Long sampleId, Long orderId) { - dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_INCOME); + dispatchVO.setCurrentSegment(EARNED_INCOME); HandOutLabExecutiveDTO handOutLabExecutiveDTO = getHandOutLabExecutiveDTO(orderId, sampleId); Integer measureNumberStatus = labExecutiveInfoMapper.getMeasureNumberStatus(orderId, sampleId); //证书，当前环节的回填 @@ -253,9 +253,9 @@ QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("sample_id", deviceStatusChangeDTO.getSampleId()); queryWrapper.eq("order_id", deviceStatusChangeDTO.getOrderId()); - queryWrapper.and(QueryWrapper -> QueryWrapper.eq("measure_status", MeasureStatusEnum.TO_ALLOCATE) + queryWrapper.and(QueryWrapper -> QueryWrapper.eq("measure_status", TO_ALLOCATE) .or().eq("measure_status", MeasureStatusEnum.TO_MEASURE) - .or().eq("measure_status", MeasureStatusEnum.IN_MEASURE)); + .or().eq("measure_status", IN_MEASURE)); BusinessLabExecutiveInfo businessLabExecutiveInfo = new BusinessLabExecutiveInfo(); businessLabExecutiveInfo.setMeasureStatus(measureStatus); businessLabExecutiveInfo.setRemark(deviceStatusChangeDTO.getReason()); @@ -280,9 +280,9 @@ QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.eq("sample_id", deviceStatusChangeDTO.getSampleId()); queryWrapper.eq("order_id", deviceStatusChangeDTO.getOrderId()); - queryWrapper.and(QueryWrapper -> QueryWrapper.eq("measure_status", MeasureStatusEnum.TO_ALLOCATE) + queryWrapper.and(QueryWrapper -> QueryWrapper.eq("measure_status", TO_ALLOCATE) .or().eq("measure_status", MeasureStatusEnum.TO_MEASURE) - .or().eq("measure_status", MeasureStatusEnum.IN_MEASURE)); + .or().eq("measure_status",IN_MEASURE)); List businessLabExecutiveInfo = labExecutiveInfoMapper.selectList(queryWrapper); return businessLabExecutiveInfo.isEmpty() ? null : businessLabExecutiveInfo.get(0); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileRegister.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileRegister.java index ac3691a..c6db37e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileRegister.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileRegister.java @@ -77,7 +77,6 @@ log.debug("invalid print file start delete, the file directory is {}", tempLocalFileDir); //删除运行空间下的文件 deleteFile(invalidFile); - return certificatePdfName; } throw new RuntimeException("the bean mapped to this certificate type is empty...");