From add91dff9f6e4809959121d7147212c5273f9ee4 Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期三, 16 七月 2025 09:21:32 +0800 Subject: [PATCH] 111 --- server/services/src/main/java/com/doumee/service/business/impl/IdentityInfoServiceImpl.java | 48 +++++++++++++++++++++--------------------------- 1 files changed, 21 insertions(+), 27 deletions(-) diff --git a/server/services/src/main/java/com/doumee/service/business/impl/IdentityInfoServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/IdentityInfoServiceImpl.java index 510ccc2..a9f3b7f 100644 --- a/server/services/src/main/java/com/doumee/service/business/impl/IdentityInfoServiceImpl.java +++ b/server/services/src/main/java/com/doumee/service/business/impl/IdentityInfoServiceImpl.java @@ -286,7 +286,7 @@ queryWrapper.le(IdentityInfo::getUpdateTime, Utils.Date.getEnd(pageWrap.getModel().getUpdateTime())); } if (pageWrap.getModel().getRemark() != null) { - queryWrapper.eq(IdentityInfo::getRemark, pageWrap.getModel().getRemark()); + queryWrapper.like(IdentityInfo::getRemark, pageWrap.getModel().getRemark()); } if (pageWrap.getModel().getType() != null) { queryWrapper.eq(IdentityInfo::getType, pageWrap.getModel().getType()); @@ -298,16 +298,16 @@ queryWrapper.eq(IdentityInfo::getAuthType, pageWrap.getModel().getAuthType()); } if (pageWrap.getModel().getLinkName() != null) { - queryWrapper.eq(IdentityInfo::getLinkName, pageWrap.getModel().getLinkName()); + queryWrapper.like(IdentityInfo::getLinkName, pageWrap.getModel().getLinkName()); } if (pageWrap.getModel().getTelephone() != null) { - queryWrapper.eq(IdentityInfo::getTelephone, pageWrap.getModel().getTelephone()); + queryWrapper.like(IdentityInfo::getTelephone, pageWrap.getModel().getTelephone()); } if (pageWrap.getModel().getLocation() != null) { - queryWrapper.eq(IdentityInfo::getLocation, pageWrap.getModel().getLocation()); + queryWrapper.like(IdentityInfo::getLocation, pageWrap.getModel().getLocation()); } if (pageWrap.getModel().getCompanyName() != null) { - queryWrapper.eq(IdentityInfo::getCompanyName, pageWrap.getModel().getCompanyName()); + queryWrapper.like(IdentityInfo::getCompanyName, pageWrap.getModel().getCompanyName()); } if (pageWrap.getModel().getLat() != null) { queryWrapper.eq(IdentityInfo::getLat, pageWrap.getModel().getLat()); @@ -323,15 +323,10 @@ queryWrapper.le(IdentityInfo::getAuditTime, Utils.Date.getEnd(pageWrap.getModel().getAuditTime())); } if (pageWrap.getModel().getAuditRemark() != null) { - queryWrapper.eq(IdentityInfo::getAuditRemark, pageWrap.getModel().getAuditRemark()); + queryWrapper.like(IdentityInfo::getAuditRemark, pageWrap.getModel().getAuditRemark()); } - for(PageWrap.SortData sortData: pageWrap.getSorts()) { - if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) { - queryWrapper.orderByDesc(sortData.getProperty()); - } else { - queryWrapper.orderByAsc(sortData.getProperty()); - } - } + queryWrapper.orderByAsc(IdentityInfo::getAuditStatus ); + queryWrapper.orderByDesc(IdentityInfo::getCreateTime ); PageData<IdentityInfo> result = PageData.from(identityInfoMapper.selectJoinPage(page,IdentityInfo.class, queryWrapper)); if(result!=null && result.getRecords()!=null){ String path = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.RESOURCE_PATH).getCode() @@ -376,39 +371,38 @@ @Transactional(rollbackFor = {BusinessException.class,Exception.class}) public void audit(AuditDTO auditDTO){ if(Objects.isNull(auditDTO) - || Objects.isNull(auditDTO.getId()) - || Objects.isNull(auditDTO.getAuditStatus())){ + || Objects.isNull(auditDTO.getId()) + || Objects.isNull(auditDTO.getAuditStatus()) + || auditDTO.getAuditStatus()<2 + || auditDTO.getAuditStatus()>3){ throw new BusinessException(ResponseStatus.BAD_REQUEST); } LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal(); IdentityInfo identityInfo = identityInfoMapper.selectById(auditDTO.getId()); - if(Objects.nonNull(identityInfo)){ + if(Objects.isNull(identityInfo)){ throw new BusinessException(ResponseStatus.DATA_EMPTY); } if(!Constants.equalsInteger(identityInfo.getAuditStatus(),Constants.ONE)){ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"宸插鎵癸紝璇峰嬁閲嶅鎿嶄綔"); } + Date date = new Date(); identityInfoMapper.update(new UpdateWrapper<IdentityInfo>().lambda() - .set(IdentityInfo::getAuditStatus,Constants.equalsInteger(auditDTO.getAuditStatus(),Constants.ZERO)?Constants.TWO:Constants.THREE) + .set(IdentityInfo::getAuditStatus, auditDTO.getAuditStatus() ) .set(StringUtils.isNotBlank(auditDTO.getAuditRemark()),IdentityInfo::getAuditRemark,auditDTO.getAuditRemark()) - .set(IdentityInfo::getAuditTime,"now()") + .set(IdentityInfo::getAuditTime,date) .set(IdentityInfo::getUpdateUser,user.getId()) - .set(IdentityInfo::getUpdateTime,"now()") + .set(IdentityInfo::getUpdateTime,date) .eq(IdentityInfo::getId,identityInfo.getId()) ); memberMapper.update(new UpdateWrapper<Member>().lambda() .set(Member::getUpdateUser,user.getId()) - .set(Member::getUpdateTime,"now()") - .set(Constants.equalsInteger(identityInfo.getType(),Constants.ZERO),Member::getWorkerIdentity,Constants.equalsInteger(auditDTO.getAuditStatus(),Constants.ZERO)?Constants.TWO:Constants.THREE) - .set(Constants.equalsInteger(identityInfo.getType(),Constants.ONE),Member::getDriverIdentity,Constants.equalsInteger(auditDTO.getAuditStatus(),Constants.ZERO)?Constants.TWO:Constants.THREE) - .set(Constants.equalsInteger(identityInfo.getType(),Constants.TWO),Member::getChefIdentity,Constants.equalsInteger(auditDTO.getAuditStatus(),Constants.ZERO)?Constants.TWO:Constants.THREE) + .set(Member::getUpdateTime,date) + .set(Constants.equalsInteger(identityInfo.getType(),Constants.ZERO),Member::getWorkerIdentity, auditDTO.getAuditStatus() ) + .set(Constants.equalsInteger(identityInfo.getType(),Constants.ONE),Member::getDriverIdentity , auditDTO.getAuditStatus() ) + .set(Constants.equalsInteger(identityInfo.getType(),Constants.TWO),Member::getChefIdentity , auditDTO.getAuditStatus() ) .eq(Member::getId,identityInfo.getMemberId()) ); } - - - - } -- Gitblit v1.9.3