钥匙柜大屏

rk

6 小时以前 cc3c6537dcd5bc7b8eb98046dfcaf0ad93484d60

钥匙柜大屏

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetLogServiceImpl.java

@@ -329,7 +329,7 @@
                .eq(JkCabinetLog::getIsdeleted, Constants.ZERO)
                .eq(JkCabinetLog::getType,Constants.ONE)
                .eq(JkCabinetLog::getKeyStatus,Constants.TWO)
                .like(StringUtils.isNotBlank(dto.getCarCode()),JkCabinetLog::getCarCode,dto.getCarCode())
                .like(StringUtils.isNotBlank(dto.getCarCode()),JkKeys::getCarCode,dto.getCarCode())
                .isNotNull(Objects.nonNull(dto.getStatus())&&Constants.equalsInteger(dto.getStatus(),Constants.ONE),JkCabinetLog::getCloseLogId)
                .isNull(Objects.nonNull(dto.getStatus())&&Constants.equalsInteger(dto.getStatus(),Constants.ZERO),JkCabinetLog::getCloseLogId)
                .orderByDesc(JkCabinetLog::getCreateDate);
@@ -339,7 +339,7 @@
            for (JkCabinetLog jkCabinetLog:jkCabinetLogs) {
                CabinetBoardUseRecordVO cabinetBoardUseRecordVO = new CabinetBoardUseRecordVO();
                BeanUtil.copyProperties(jkCabinetLog,cabinetBoardUseRecordVO);
                cabinetBoardUseRecordVO.setStatus(Objects.nonNull(jkCabinetLog.getReturnDate())?Constants.ZERO:Constants.ONE);
                cabinetBoardUseRecordVO.setStatus(Objects.nonNull(jkCabinetLog.getReturnDate())?Constants.ONE:Constants.ZERO);
                cabinetBoardUseRecordVO.setRemark(Objects.isNull(jkCabinetLog.getOpenWay())?"":
                        Constants.equalsInteger(jkCabinetLog.getOpenWay(),Constants.ZERO)?"随车领取":
                                Constants.equalsInteger(jkCabinetLog.getOpenWay(),Constants.ONE)?"随派车单领取":"保洁领取"