From c3aaf28f7316cce12eec007a9f85a96cbcddeec2 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期三, 07 五月 2025 10:34:20 +0800 Subject: [PATCH] 最新版本541200007 --- server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformBooksServiceImpl.java | 76 +++++++++++++++++++++++++++++++------- 1 files changed, 62 insertions(+), 14 deletions(-) diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformBooksServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformBooksServiceImpl.java index f3398ca..c9c0ab1 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformBooksServiceImpl.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformBooksServiceImpl.java @@ -1,11 +1,13 @@ package com.doumee.service.business.impl; +import com.alibaba.fastjson.JSONObject; import com.doumee.biz.system.SystemDictDataBiz; import com.doumee.core.constants.ResponseStatus; import com.doumee.core.exception.BusinessException; -import com.doumee.core.model.LoginUserInfo; -import com.doumee.core.model.PageData; -import com.doumee.core.model.PageWrap; +import com.doumee.dao.business.dao.UserActionMapper; +import com.doumee.service.business.third.model.LoginUserInfo; +import com.doumee.service.business.third.model.PageData; +import com.doumee.service.business.third.model.PageWrap; import com.doumee.core.utils.Constants; import com.doumee.core.utils.DateUtil; import com.doumee.core.utils.SmsConstants; @@ -35,6 +37,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.doumee.service.business.third.EmayService; +import com.github.yulichang.wrapper.MPJLambdaWrapper; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -58,6 +61,10 @@ @Autowired private PlatformBooksMapper platformBooksMapper; + @Autowired + private UserActionMapper userActionMapper; + @Autowired + private PlatformJobMapper platformJobMapper; @Autowired private NoticesJoinMapper noticesJoinMapper; @@ -101,6 +108,9 @@ @Autowired private WxNoticeConfigMapper wxNoticeConfigMapper; + @Autowired + private ApproveMapper approveMapper; + @Override public Integer create(PlatformBooks platformBooks) { @@ -113,7 +123,39 @@ public void deleteById(Integer id) { platformBooksMapper.deleteById(id); } - + @Override + @Transactional(rollbackFor = {BusinessException.class,Exception.class}) + public void deleteById(Integer id,LoginUserInfo user) { + PlatformBooks model =findById(id); + if(model ==null || Constants.equalsInteger(model.getIsdeleted(),Constants.ONE)){ + throw new BusinessException(ResponseStatus.DATA_EMPTY); + } + Date date =new Date(); + platformBooksMapper.update(null,new UpdateWrapper<PlatformBooks>().lambda() + .set(PlatformBooks::getIsdeleted,Constants.ONE) + .set(PlatformBooks::getEditDate,date) + .set(PlatformBooks::getEditor,user.getId()) + .eq(PlatformBooks::getId,id)); + if(model.getJobId()!=null){ + platformJobMapper.update(null,new UpdateWrapper<PlatformJob>().lambda() + .set(PlatformJob::getIsdeleted,Constants.ONE) + .set(PlatformJob::getEditDate,new Date()) + .set(PlatformJob::getEditor,user.getId()) + .eq(PlatformJob::getId,model.getJobId()) + .eq(PlatformJob::getIsdeleted,Constants.ZERO)); + } + String[] params = new String[3]; + params[0] = user.getRealname(); + params[1]=DateUtil.getPlusTime2(date); + params[2]="銆愬悎鍚屽彿锛�"+model.getContractNum()+"銆�-銆愬徃鏈猴細"+model.getDriverName()+" "+model.getDriverPhone()+"銆�-銆愯溅鐗屽ソ锛� "+model.getPlateNum()+"銆�"; + //璁板綍鍒犻櫎鏃ュ織 + UserActionServiceImpl.saveUserActionBiz(user,id,Constants.UserActionType.PLATFROM_BOOK_DEL,userActionMapper,date,params, JSONObject.toJSONString(model)); + //鏍囪浠诲姟璁板綍 + VisitsServiceImpl.dealCancelNoticesData(noticesJoinMapper,approveMapper,"绯荤粺鍒犻櫎",model.getId(), + Constants.approveObjectType.reason, + Constants.noticesObjectType.reason + ); + } @Override public void delete(PlatformBooks platformBooks) { UpdateWrapper<PlatformBooks> deleteWrapper = new UpdateWrapper<>(platformBooks); @@ -163,9 +205,13 @@ @Override public PageData<PlatformBooks> findPage(PageWrap<PlatformBooks> pageWrap) { IPage<PlatformBooks> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity()); - QueryWrapper<PlatformBooks> queryWrapper = new QueryWrapper<>(); + MPJLambdaWrapper<PlatformBooks> queryWrapper = new MPJLambdaWrapper<>(); + pageWrap.getModel().setIsdeleted(Constants.ZERO); Utils.MP.blankToNull(pageWrap.getModel()); - queryWrapper.lambda() + queryWrapper + .selectAll(PlatformBooks.class) + .selectAs(PlatformJob::getStatus,PlatformBooks::getJobStatus) + .leftJoin(PlatformJob.class,PlatformJob::getId,PlatformBooks::getJobId) .eq(pageWrap.getModel().getId() != null, PlatformBooks::getId, pageWrap.getModel().getId()) .eq(pageWrap.getModel().getCreator() != null, PlatformBooks::getCreator, pageWrap.getModel().getCreator()) .ge(pageWrap.getModel().getCreateDate() != null, PlatformBooks::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate())) @@ -177,7 +223,7 @@ .eq(pageWrap.getModel().getName() != null, PlatformBooks::getName, pageWrap.getModel().getName()) .eq(pageWrap.getModel().getRemark() != null, PlatformBooks::getRemark, pageWrap.getModel().getRemark()) .eq(pageWrap.getModel().getStatus() != null, PlatformBooks::getStatus, pageWrap.getModel().getStatus()) - .eq(pageWrap.getModel().getContractNum() != null, PlatformBooks::getContractNum, pageWrap.getModel().getContractNum()) + .like(pageWrap.getModel().getContractNum() != null, PlatformBooks::getContractNum, pageWrap.getModel().getContractNum()) .ge(pageWrap.getModel().getArriveDate() != null, PlatformBooks::getArriveDate, Utils.Date.getStart(pageWrap.getModel().getArriveDate())) .le(pageWrap.getModel().getArriveDate() != null, PlatformBooks::getArriveDate, Utils.Date.getEnd(pageWrap.getModel().getArriveDate())) .eq(pageWrap.getModel().getInType() != null, PlatformBooks::getInType, pageWrap.getModel().getInType()) @@ -189,11 +235,13 @@ .eq(pageWrap.getModel().getPlateNum() != null, PlatformBooks::getPlateNum, pageWrap.getModel().getPlateNum()) .eq(pageWrap.getModel().getDriverPhone() != null, PlatformBooks::getDriverPhone, pageWrap.getModel().getDriverPhone()) .ge(pageWrap.getModel().getQueryDate() != null, PlatformBooks::getCreateDate, pageWrap.getModel().getQueryDate()) - .ge(pageWrap.getModel().getArriveDateStart() != null, PlatformBooks::getArriveDate, Utils.Date.getStart(pageWrap.getModel().getArriveDateStart())) - .le(pageWrap.getModel().getArriveDateEnd() != null, PlatformBooks::getArriveDate, Utils.Date.getEnd(pageWrap.getModel().getArriveDateEnd())) + .ge(pageWrap.getModel().getArriveDateStart() != null, PlatformBooks::getArriveDate, pageWrap.getModel().getArriveDateStart()) + .le(pageWrap.getModel().getArriveDateEnd() != null, PlatformBooks::getArriveDate, pageWrap.getModel().getArriveDateEnd()) + .eq(pageWrap.getModel().getReasonId() != null, PlatformBooks::getReasonId, pageWrap.getModel().getReasonId()) + .eq(pageWrap.getModel().getJobStatus() != null, PlatformJob::getStatus, pageWrap.getModel().getJobStatus()) .orderByDesc(PlatformBooks::getCreateDate) ; - PageData<PlatformBooks> pageData = PageData.from(platformBooksMapper.selectPage(page, queryWrapper)); + PageData<PlatformBooks> pageData = PageData.from(platformBooksMapper.selectJoinPage(page,PlatformBooks.class, queryWrapper)); for (PlatformBooks platformBooks:pageData.getRecords()) { if(Constants.equalsInteger(platformBooks.getStatus(),Constants.ONE)||Constants.equalsInteger(platformBooks.getStatus(),Constants.ZERO)){ String auditName = approveService.getApproveUserName(platformBooks.getId(),Constants.approveObjectType.reason); @@ -231,6 +279,7 @@ List<PlatformBooks> platformBooksList = platformBooksMapper.selectList(new QueryWrapper<PlatformBooks>().lambda() .eq(PlatformBooks::getReasonId,platformBooksCheckNumDTO.getReasonId()) .ne(PlatformBooks::getStatus,Constants.THREE) + .eq(PlatformBooks::getIsdeleted,Constants.ZERO) .like(PlatformBooks::getCreateDate, DateUtil.getDate(platformBooksCheckNumDTO.getArriveDate(),"yyyy-MM-dd")) ); if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(platformBooksList)){ @@ -312,7 +361,6 @@ wxPlatNotice.sendPlatformBookTemplateNotice(systemDictDataBiz, wxNoticeConfigMapper, platformBooks, WxPlatConstants.platformBookContent.platformBookUpload, - systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(), Arrays.asList(driver.getOpenid().split(",")),0); } return platformBooks.getId(); @@ -343,7 +391,7 @@ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"["+platformBooksApplyDTO.getCarCodeFront()+"]灞炰簬鍐呴儴杞﹁締锛屾棤娉曢绾�"); }; PlatformBooks platformBooks = platformBooksMapper.selectById(platformBooksApplyDTO.getId()); - if(Objects.isNull(platformBooks)){ + if(Objects.isNull(platformBooks)||Constants.equalsInteger(platformBooks.getIsdeleted(),Constants.ONE)){ throw new BusinessException(ResponseStatus.DATA_EMPTY); } if(!Constants.equalsInteger(platformBooks.getStatus(),Constants.ZERO)){ @@ -362,7 +410,7 @@ @Override public PlatformBooks getDetail(Integer id,Integer memberId){ PlatformBooks model = platformBooksMapper.selectById(id); - if(Objects.isNull(model)){ + if(Objects.isNull(model)||Constants.equalsInteger(model.getIsdeleted(),Constants.ONE)){ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌棰勭害璁板綍"); } String prefixUrl = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode() + @@ -423,7 +471,7 @@ throw new BusinessException(ResponseStatus.BAD_REQUEST); } PlatformBooks model = platformBooksMapper.selectById(revokeDTO.getId()); - if(Objects.isNull(model)){ + if(Objects.isNull(model)||Constants.equalsInteger(model.getIsdeleted(),Constants.ONE)){ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌棰勭害璁板綍"); } if(!(Constants.equalsInteger(model.getStatus(),Constants.ZERO)||Constants.equalsInteger(model.getStatus(),Constants.ONE))){ -- Gitblit v1.9.3