From 4e2e52b766d87fc528d02bdebc1757c3dda8c596 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期三, 26 二月 2025 09:22:24 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java | 40 ++++++++++++++++++++++++++++++++++------ 1 files changed, 34 insertions(+), 6 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 120c174..0712acb 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 @@ -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.*; import com.doumee.core.wx.wxPlat.WxPlatConstants; import com.doumee.core.wx.wxPlat.WxPlatNotice; @@ -56,6 +58,8 @@ @Autowired private CarUseBookMapper carUseBookMapper; + @Autowired + private UserActionMapper userActionMapper; @Autowired private CarUseBookJoinMapper carUseBookJoinMapper; @@ -148,7 +152,7 @@ } carUseBookMapper.insert(carUseBook); //鐢ㄨ溅鐢宠 瀹℃壒璁板綍鍒涘缓 - approveService.createApproveFlow(carUseBook.getType()==0?3:4,carUseBook.getId(),carUseBook.getMemberId()); + approveService.createApproveFlow(carUseBook.getType()==0?3:4,carUseBook.getId(),carUseBook.getMemberId(),null); //鍙戦�佸井淇″叕浼楀彿閫氱煡 //鍙戦�佸井淇″叕浼楀彿閫氱煡 WxPlatNotice wxPlatNotice = new WxPlatNotice(); @@ -161,7 +165,6 @@ systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(), Arrays.asList(systemUser.getOpenid().split(",")),0); } - return carUseBook.getId(); } @@ -169,7 +172,32 @@ public void deleteById(Integer id) { carUseBookMapper.deleteById(id); } - + @Override + @Transactional(rollbackFor = {BusinessException.class,Exception.class}) + public void deleteById(Integer id,LoginUserInfo user) { + Date date = new Date(); + MPJLambdaWrapper<CarUseBook> queryWrapper = new MPJLambdaWrapper<>(); + queryWrapper.selectAll(CarUseBook.class); + queryWrapper.select("t1.name",CarUseBook::getMemberName); + queryWrapper.leftJoin(Member.class,Member::getId,CarUseBook::getMemberId) + .eq(CarUseBook::getId,id) + .last("limit 1" ); + CarUseBook model = carUseBookMapper.selectJoinOne(CarUseBook.class,queryWrapper); + if(model==null ||Constants.equalsInteger(Constants.ONE,model.getIsdeleted())){ + throw new BusinessException(ResponseStatus.DATA_EMPTY); + } + carUseBookMapper.update(null,new UpdateWrapper<CarUseBook>().lambda() + .set(CarUseBook::getIsdeleted,Constants.ONE) + .set(CarUseBook::getEditDate,date) + .set(CarUseBook::getEditor,user.getId()) + .eq(CarUseBook::getId,id)); + String[] params = new String[3]; + params[0] = user.getRealname(); + params[1]=DateUtil.getPlusTime2(date); + params[2]=model.getCarCode()+"-銆愪箻杞︿汉锛�"+model.getMemberNames()+" 銆�-銆愰绾︿汉锛�"+model.getMemberName()+"銆�-銆愭椂闂达細"+DateUtil.getPlusTime2(model.getStartTime())+"-"+DateUtil.getPlusTime2(model.getEndTime())+"銆�"; + //璁板綍鍒犻櫎鏃ュ織 + UserActionServiceImpl.saveUserActionBiz(user,id,Constants.UserActionType.CAR_BOOK_DEL,userActionMapper,date,params, JSONObject.toJSONString(model)); + } @Override public void delete(CarUseBook carUseBook) { UpdateWrapper<CarUseBook> deleteWrapper = new UpdateWrapper<>(carUseBook); -- Gitblit v1.9.3