From f5ab83dfad01c87828232af8cd18c676e69fd917 Mon Sep 17 00:00:00 2001 From: MrShi <1878285526@qq.com> Date: 星期三, 21 五月 2025 09:14:11 +0800 Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit --- server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java index 5809375..e4fcb35 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java @@ -569,7 +569,7 @@ .set(Approve::getStatus,Constants.FOUR) .set(Approve::getCheckInfo,"鐢ㄨ溅鐢宠鍙栨秷") .in(Approve::getStatus,Constants.ZERO,Constants.ONE) - .in(Approve::getObjType,Constants.approveObjectType.cityUseCar,Constants.approveObjectType.unCityUseCar) + .in(Approve::getObjType,Constants.approveObjectType.cityUseCar,Constants.approveObjectType.unCityUseCar) .eq(Approve::getObjId,id) ); @@ -617,19 +617,20 @@ //鐢宠浜哄彲浠ユ挙閿�鑷繁鐢宠涓殑鐢宠璁板綍 return Constants.ONE; } - if(Constants.equalsInteger(carUseBook.getStatus(),Constants.TWO) && carUseBook.getStartTime()!=null + if(Constants.equalsInteger(carUseBook.getStatus(),Constants.TWO) + && carUseBook.getStartTime()!=null && System.currentTimeMillis() >= carUseBook.getStartTime().getTime()){ //瀹℃壒閫氳繃锛屼絾鏄� 宸插埌鍙戣溅鏃堕棿锛屼笉鍙互鎾ら攢 return Constants.ZERO; } - if(!(Constants.equalsInteger(carUseBook.getStatus(),Constants.ZERO)) + if((Constants.equalsInteger(carUseBook.getStatus(),Constants.ZERO)) ||Constants.equalsInteger(carUseBook.getStatus(),Constants.ONE) ||Constants.equalsInteger(carUseBook.getStatus(),Constants.TWO)){ //瀹℃壒浜哄彲浠ユ挙閿� 鑷繁瀹℃壒鐨勭敵璇疯褰� Approve approve = approveJoinMapper.selectOne(new QueryWrapper<Approve>().lambda() .eq(Approve::getIsdeleted,Constants.ZERO) .ge(Approve::getLevel,Constants.ZERO) - .eq(Approve::getChekorId,loginUserInfo.getId()) + .eq(Approve::getChekorId,loginUserInfo.getMemberId()) .eq(Approve::getObjId,carUseBook.getId()) .eq(Approve::getObjType,carUseBook.getType()==0?3:4) .last("limit 1")); -- Gitblit v1.9.3