From 295a88ff694147e58abce6f2bb962607c7e2a1e1 Mon Sep 17 00:00:00 2001 From: nidapeng <jp@doumee.com> Date: 星期四, 07 三月 2024 11:11:13 +0800 Subject: [PATCH] 整理 --- server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java | 24 +++++++++++++++++++----- 1 files changed, 19 insertions(+), 5 deletions(-) diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java index 5bc3112..6e63bab 100644 --- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java +++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java @@ -1012,13 +1012,18 @@ ||StringUtils.isBlank(param.getUserId())){ throw new BusinessException(ResponseStatus.BAD_REQUEST); } + if(Objects.nonNull(param.getValidStartTime())&&Objects.nonNull(param.getValidEndTime())){ + if(param.getValidStartTime().getTime()> param.getValidEndTime().getTime()){ + throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝鏈夋晥鏈熸椂闂翠笉鍚堟硶锛�"); + } + } Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda().eq(Member::getErpId,param.getUserId()).last("limit 1")); if(Objects.isNull(member)){ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝鐢ㄦ埛淇℃伅涓嶅瓨鍦紒"); } List<Integer> doorIds = getRoleIdByParam(param.getRoleIds(),member); - if(StringUtils.isBlank(member.getRoleId())){ - throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏈煡璇㈠埌闂ㄧ缁勬暟鎹�"); + if(param.getRoleIds()!=null && param.getRoleIds().length>0 && StringUtils.isBlank(member.getRoleId())){ + throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝鏈煡璇㈠埌鏈夋晥闂ㄧ缁勬暟鎹�"); } //鏇存柊鎺堟潈鏈夋晥鏈� Member update = new Member(); @@ -1029,7 +1034,14 @@ update.setRoleId(StringUtils.isNotBlank(member.getRoleId())?member.getRoleId():null); update.setHkStatus(Constants.ZERO);//鍋氫竴閬嶆洿鏂伴�昏緫 update.setRemark("寰呭悓姝ュ畨闃插钩鍙�"); - memberMapper.updateById(update); + memberMapper.update(null,new UpdateWrapper<Member>().lambda() + .eq(Member::getId,member.getId()) + .set(Member::getRoleId,member.getRoleId()) + .set(Member::getRemark,"寰呭悓姝ュ畨闃插钩鍙�") + .set(Member::getStartTime,param.getValidStartTime()) + .set(Member::getEndTime,param.getValidEndTime()) + .set(Member::getEditDate,new Date()) + .set(Member::getHkStatus,Constants.ZERO )); } @@ -1054,13 +1066,15 @@ .set(ParkBook::getIsdeleted,Constants.ONE) .set(ParkBook::getHkStatus,Constants.ZERO) ); + //鏌ヨ杞﹀簱淇℃伅 List<Parks> parksList = new ArrayList<>(); if(CollectionUtils.isNotEmpty(param.getParkIdList())){ - parksList = parksMapper.selectList(new QueryWrapper<Parks>().lambda() + parksList = parksMapper.selectList(new QueryWrapper<Parks>().lambda() .in(Parks::getId,param.getParkIdList()) ); + }else{ + throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝鍋滆溅搴撲俊鎭笉瀛樺湪锛屾巿鏉冨け璐�"); } - //鏌ヨ杞﹀簱淇℃伅 if(CollectionUtils.isNotEmpty(parksList)){ List<ParkBook> parkBookList = new ArrayList<>(); for (Parks parks:parksList) { -- Gitblit v1.9.3