From 3cf0ce0145ea553ec128d5e892308da0fbadc3c1 Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期一, 31 三月 2025 09:31:13 +0800 Subject: [PATCH] 代码初始化 --- server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java | 50 +++++++++++++++++++++++++++++++------------------- 1 files changed, 31 insertions(+), 19 deletions(-) diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java index 6360447..398ab01 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java @@ -569,7 +569,7 @@ .eq(ApproveParam::getLevel,Constants.ONE) .eq(ApproveParam::getMemberType,Constants.ZERO) .last("limit 1")); - return Objects.isNull(approveParam)?null:approveParam.getId(); + return Objects.isNull(approveParam)?null:approveParam.getId(); } @@ -1574,28 +1574,41 @@ } - - /** - * 澶勭悊寰呭鏍搞�佸鏍镐腑銆佸凡瀹℃牳鐨勬暟鎹彇娑堜笟鍔� - * 2025骞�3鏈�25鏃�14:10:10 - */ @Override - public void visitsCancel(Integer visitId,LoginUserInfo loginUserInfo){ + public void visitsSelfCancel(Integer visitId,Integer memberId){ Visits visits = visitsMapper.selectById(visitId); if(Objects.isNull(visits)){ throw new BusinessException(ResponseStatus.DATA_EMPTY); } - if(!(Constants.equalsInteger(loginUserInfo.getMemberId(),visits.getMemberId()) || - Constants.equalsInteger(loginUserInfo.getMemberId(),visits.getCreateMemberId()) || - ( CollectionUtils.isNotEmpty(loginUserInfo.getPermissions()) && - loginUserInfo.getPermissions().stream().filter(i->i.equals("business:visits:cancel")).collect(Collectors.toList()).size()>0))){ + if(!(Constants.equalsInteger(memberId,visits.getMemberId()))){ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏃犳鎿嶄綔鏉冮檺"); } + this.visitsCancelBiz(visits); + } + + @Override + public void visitsCancel(Integer visitId,LoginUserInfo loginUserInfo) { + Visits visits = visitsMapper.selectById(visitId); + if (Objects.isNull(visits)) { + throw new BusinessException(ResponseStatus.DATA_EMPTY); + } + if(!( + CollectionUtils.isNotEmpty(loginUserInfo.getPermissions()) && + loginUserInfo.getPermissions().stream().filter(i->i.equals("business:visits:cancel")).collect(Collectors.toList()).size()>0)){ + throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏃犳鎿嶄綔鏉冮檺"); + } + this.visitsCancelBiz(visits); + } + /** + * 澶勭悊寰呭鏍搞�佸鏍镐腑銆佸凡瀹℃牳鐨勬暟鎹彇娑堜笟鍔� + * 2025骞�3鏈�25鏃�14:10:10 + */ + public void visitsCancelBiz(Visits visits){ UpdateWrapper<Visits> updateWrapper = new UpdateWrapper(); updateWrapper.lambda().set(Visits::getStatus,Constants.VisitStatus.cancel) .set(Visits::getEditDate,DateUtil.getCurrDateTime()) - .set(Visits::getEditor,loginUserInfo.getId()) - .eq(Visits::getId,visitId); + .set(Visits::getEditor,visits.getEditor()) + .eq(Visits::getId,visits.getId()); //璁垮鎶ュ if(Constants.equalsInteger(visits.getType(),Constants.TWO)){ if(!(Constants.equalsInteger(visits.getStatus(),Constants.VisitStatus.waitCheck)||Constants.equalsInteger(visits.getStatus(),Constants.VisitStatus.submitCheck) @@ -1604,7 +1617,7 @@ } if(Constants.equalsInteger(visits.getStatus(),Constants.VisitStatus.pass) && Constants.equalsInteger(visits.getHkStatus(),Constants.ONE) - &&StringUtils.isNotBlank(visits.getHkId())){ + &&StringUtils.isNotBlank(visits.getCarNos())){ //鍙栨秷鍋滆溅鍦洪绾� List<VisitPark> visitParkList = visitParkMapper.selectList(new QueryWrapper<VisitPark>().lambda() .eq(VisitPark::getCarCode,visits.getCarNos()) @@ -1640,9 +1653,9 @@ } if(Constants.equalsInteger(visits.getStatus(),Constants.VisitStatus.xfSuccess) && Constants.equalsInteger(visits.getHkStatus(),Constants.ONE) - &&StringUtils.isNotBlank(visits.getHkId())){ + &&StringUtils.isNotBlank(visits.getHkRecordId())){ VisitAppointmentCancelRequest request = new VisitAppointmentCancelRequest(); - request.setAppointRecordIds(new String[]{visits.getHkId()}); + request.setAppointRecordIds(new String[]{visits.getHkRecordId()}); BaseResponse response = HKService.iccmCancelAppointment(request); if(response==null || !StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE) || response.getData()==null){ throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),response.getMsg()); @@ -1670,7 +1683,6 @@ .set(Notices::getInfo,"鎵嬪姩鍙栨秷") // .set(Notices::getStatus,Constants.ONE) .set(Notices::getParam2,Constants.FOUR)//宸插彇娑� - .eq(Notices::getIsdeleted,Constants.ZERO) .eq(Notices::getStatus,Constants.ZERO) .eq(Notices::getParam2,Constants.ZERO)//寰呭鐞� .eq(Notices::getObjId,visits.getId()) @@ -2025,7 +2037,8 @@ .eq(Visits::getId,s.getId())); VisitsServiceImpl.dealCancelNoticesData(noticesJoinMapper,approveMapper,"绯荤粺鍙栨秷",s.getId(), - s.getType(),Constants.equalsInteger(s.getType(),Constants.ZERO)?Constants.noticesObjectType.visit:Constants.noticesObjectType.visitReporting + s.getType(), + !Constants.equalsInteger(s.getType(),Constants.TWO)?Constants.noticesObjectType.visit:Constants.noticesObjectType.visitReporting ); @@ -2076,7 +2089,6 @@ .set(Notices::getEditDate,new Date()) .set(Notices::getInfo,info) .set(Notices::getParam2,Constants.FOUR)//宸插彇娑� - .eq(Notices::getIsdeleted,Constants.ZERO) .eq(Notices::getStatus,Constants.ZERO) .eq(Notices::getParam2,Constants.ZERO)//寰呭鐞� .eq(Notices::getObjId,objId) -- Gitblit v1.9.3