From 218e84d2264e413f31a2f3957f05bb7b8ad42d5d Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期一, 29 九月 2025 10:36:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java | 207 +++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 181 insertions(+), 26 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 1ba80f2..e4fcb35 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,18 +1,30 @@
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;
import com.doumee.dao.business.*;
+import com.doumee.dao.business.dao.MemberMapper;
+import com.doumee.dao.business.dao.SmsConfigMapper;
+import com.doumee.dao.business.dao.SmsEmailMapper;
import com.doumee.dao.business.join.ApproveJoinMapper;
import com.doumee.dao.business.join.CarUseBookJoinMapper;
import com.doumee.dao.business.model.*;
import com.doumee.dao.business.vo.ApproveDataVO;
import com.doumee.dao.business.vo.DateIntervalVO;
+
+import com.doumee.dao.business.model.Member;
+import com.doumee.dao.system.SystemUserMapper;
+import com.doumee.dao.system.join.NoticesJoinMapper;
+import com.doumee.dao.system.model.Notices;
import com.doumee.dao.system.model.SystemDictData;
import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.ApproveService;
@@ -23,8 +35,8 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.doumee.service.business.third.EmayService;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import io.swagger.annotations.ApiModelProperty;
import org.apache.commons.lang3.StringUtils;
+import org.checkerframework.checker.units.qual.C;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -33,10 +45,8 @@
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
-import java.time.temporal.ChronoUnit;
import java.util.*;
import java.util.Date;
-import java.util.stream.Collectors;
/**
* 杞﹁締_鐢ㄨ溅鐢宠淇℃伅琛⊿ervice瀹炵幇
@@ -48,7 +58,11 @@
@Autowired
private CarUseBookMapper carUseBookMapper;
+ @Autowired
+ private ApproveMapper approveMapper;
+ @Autowired
+ private UserActionMapper userActionMapper;
@Autowired
private CarUseBookJoinMapper carUseBookJoinMapper;
@@ -60,6 +74,9 @@
@Autowired
private ApproveJoinMapper approveJoinMapper;
+
+ @Autowired
+ private NoticesJoinMapper noticesJoinMapper;
@Autowired
private ApproveService approveService;
@@ -79,6 +96,12 @@
@Autowired
private EmayService emayService;
+
+ @Autowired
+ private WxNoticeConfigMapper wxNoticeConfigMapper;
+
+ @Autowired
+ private SystemUserMapper systemUserMapper;
@Override
@Transactional(rollbackFor = {Exception.class,BusinessException.class})
@@ -101,7 +124,7 @@
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"褰撳墠鐧诲綍鐢ㄦ埛鏃犳硶杩涜璇ユ搷浣�!");
}
if(carUseBook.getEndTime().getTime()<=System.currentTimeMillis()){
- throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"閫夋嫨鏃ユ湡寮傚父[缁撴潫鏃堕棿灏忎簬褰撳墠鏃堕棿],璇峰埛鏂伴噸璇�");
+// throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"閫夋嫨鏃ユ湡寮傚父[缁撴潫鏃堕棿灏忎簬褰撳墠鏃堕棿],璇峰埛鏂伴噸璇�");
}
if(!(DateUtil.getDateFromString(carUseBook.getPlanUseDate()+":00").getTime()>=carUseBook.getStartTime().getTime()
&& DateUtil.getDateFromString(carUseBook.getPlanUseDate() +":00").getTime()<= carUseBook.getEndTime().getTime())
@@ -120,7 +143,7 @@
CarDriver carDriver = carDriverMapper.selectOne(new QueryWrapper<CarDriver>().lambda()
.eq(CarDriver::getCarId,cars.getId())
.eq(CarDriver::getIsdeleted,Constants.ZERO)
- .eq(CarDriver::getStatus,Constants.ONE)
+// .eq(CarDriver::getStatus,Constants.ZERO)
.last( " limit 1 ")
);
if(Objects.nonNull(carDriver)&&Objects.nonNull(carDriver.getMemberId())){
@@ -132,7 +155,18 @@
}
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();
+ SystemUser systemUser = systemUserMapper.selectById(carUseBook.getCreator());
+ if(Objects.nonNull(systemUser) && StringUtils.isNotBlank(systemUser.getOpenid())){
+ carUseBook.setMemberName(systemUser.getRealname());
+ wxPlatNotice.sendCarUseBookTemplateNotice(systemDictDataBiz,
+ wxNoticeConfigMapper,carUseBook,
+ WxPlatConstants.carUseBookContent.carUseBookUpload,
+ Arrays.asList(systemUser.getOpenid().split(",")),0);
+ }
return carUseBook.getId();
}
@@ -140,7 +174,38 @@
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)
+ .eq(CarUseBook::getIsdeleted,Constants.ZERO)
+ .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));
+ VisitsServiceImpl.dealCancelNoticesData(noticesJoinMapper,approveMapper,"绯荤粺鍒犻櫎",model.getId(),
+ Constants.equalsInteger(model.getType(),Constants.ZERO)?Constants.approveObjectType.cityUseCar:Constants.approveObjectType.unCityUseCar,
+ Constants.noticesObjectType.useCar
+ );
+ }
@Override
public void delete(CarUseBook carUseBook) {
UpdateWrapper<CarUseBook> deleteWrapper = new UpdateWrapper<>(carUseBook);
@@ -189,15 +254,14 @@
.leftJoin(Member.class,Member::getId,CarUseBook::getDriverId)
.leftJoin("company t4 on t1.company_id=t4.id")
.eq(CarUseBook::getId,id)
+ .eq(CarUseBook::getIsdeleted,Constants.ZERO)
.last("limit 1" );
CarUseBook model = carUseBookMapper.selectJoinOne(CarUseBook.class,queryWrapper);
if(Objects.isNull(model)){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
- ApproveDataVO approveDataVO = approveService.arrangeApprovedData(id,
- Constants.equalsInteger(model.getType(),Constants.ZERO)?3:4,
- memberId);
- List<Approve> approveList = approveDataVO.getApproveList();
+ model.setApproveDateVO(getApproveDataVO(memberId,model));
+ List<Approve> approveList = model.getApproveDateVO().getApproveList();
if(Constants.equalsInteger(model.getStatus(),Constants.FOUR)){
String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()
+systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
@@ -220,8 +284,30 @@
approve.setCheckDate(model.getCancelTime());
approveList.add(approve);
}
- model.setApproveDateVO(approveDataVO);
+
+ Notices notices = noticesJoinMapper.selectOne(new QueryWrapper<Notices>().lambda()
+ .eq(Notices::getObjId,id)
+ .eq(Notices::getType,Constants.noticesObjectType.useCar)
+ .eq(Notices::getUserId,memberId)
+ .eq(Notices::getSendacopy,Constants.ZERO)
+ .orderByDesc(Notices::getId).last(" limit 1 "));
+ if(Objects.nonNull(notices)){
+ if(Constants.equalsInteger(notices.getStatus(),Constants.ZERO)){
+ model.setInfo("寰呮垜澶勭悊");
+ }else{
+ model.setInfo(notices.getInfo());
+ }
+ }
+
+
return model;
+ }
+
+ private ApproveDataVO getApproveDataVO( Integer memberId,CarUseBook model) {
+ ApproveDataVO approveDataVO = approveService.arrangeApprovedData(model.getId(),
+ Constants.equalsInteger(model.getType(),Constants.ZERO)?3:4,
+ memberId);
+ return approveDataVO;
}
@Override
@@ -250,7 +336,8 @@
queryWrapper.select("t4.company_name_path",CarUseBook::getCompanyName);
queryWrapper.leftJoin(Member.class,Member::getId,CarUseBook::getMemberId)
.leftJoin(Member.class,Member::getId,CarUseBook::getDriverId)
- .leftJoin("company t4 on t1.company_id=t4.id"); //鏁版嵁鏉冮檺寮�濮�--------------------start----------------
+ .leftJoin("company t4 on t1.company_id=t4.id");
+ //鏁版嵁鏉冮檺寮�濮�--------------------start----------------
LoginUserInfo userInfo =pageWrap.getModel().getLoginUserInfo();
if(userInfo!=null && userInfo.getCompanyIdList()!=null){
if( userInfo.getCompanyIdList().size() ==0){
@@ -301,8 +388,8 @@
.and(StringUtils.isNotBlank(pageWrap.getModel().getMemberName()), ms->ms.like(Member::getName,pageWrap.getModel().getMemberName())
.or().like(Member::getPhone,pageWrap.getModel().getMemberName()))
- .ge(Objects.nonNull(pageWrap.getModel().getQueryStartTime()), CarUseBook::getPlanUseDate,pageWrap.getModel().getQueryStartTime())
- .le(Objects.nonNull(pageWrap.getModel().getQueryEndTime()),CarUseBook::getPlanUseDate,pageWrap.getModel().getQueryEndTime())
+ .ge(Objects.nonNull(pageWrap.getModel().getQueryStartTime()), CarUseBook::getCreateDate,pageWrap.getModel().getQueryStartTime())
+ .le(Objects.nonNull(pageWrap.getModel().getQueryEndTime()),CarUseBook::getCreateDate,pageWrap.getModel().getQueryEndTime())
.orderByDesc(Visits::getCreateDate)
;
for(PageWrap.SortData sortData: pageWrap.getSorts()) {
@@ -312,7 +399,13 @@
queryWrapper.orderByAsc(sortData.getProperty());
}
}
- return PageData.from(carUseBookMapper.selectJoinPage(page, CarUseBook.class, queryWrapper));
+ PageData<CarUseBook> result =PageData.from(carUseBookMapper.selectJoinPage(page, CarUseBook.class, queryWrapper));
+ if(result!=null && result.getRecords()!=null){
+ for(CarUseBook carUseBook:result.getRecords()){
+ carUseBook.setHasRole(getHasBackRoleBiz(carUseBook,pageWrap.getModel().getLoginUserInfo()));
+ }
+ }
+ return result;
}
@Override
@@ -341,6 +434,7 @@
.selectAs(Member::getName,CarUseBook::getMemberName)
.selectAs(Member::getPhone,CarUseBook::getMemberMobile)
.leftJoin(Member.class,Member::getId,CarUseBook::getMemberId)
+ .eq(CarUseBook::getIsdeleted,Constants.ZERO)
.eq(CarUseBook::getCarId,carUseBook.getCarId())
.in(CarUseBook::getStatus,0,1,2)
.apply(" ( " +
@@ -414,7 +508,7 @@
}
//鍒ゆ柇鏃堕棿鏄惁澶т簬褰撳墠
if(Constants.equalsInteger(dateIntervalVO.getIsUse(),Constants.ZERO) && DateUtil.getDateFromString(dateIntervalVO.getEndTime()).getTime()<=System.currentTimeMillis()){
- dateIntervalVO.setIsUse(Constants.ONE);
+// dateIntervalVO.setIsUse(Constants.ONE);
continue;
}
}
@@ -452,9 +546,12 @@
@Override
public void revoke(Integer id, String info, LoginUserInfo loginUserInfo){
CarUseBook carUseBook = carUseBookMapper.selectById(id);
- if(Objects.isNull(carUseBook)){
- throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌鐢ㄨ溅鐢宠淇℃伅");
- }
+ if(Objects.isNull(carUseBook) || Constants.equalsInteger(carUseBook.getIsdeleted(),Constants.ONE)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌鐢ㄨ溅鐢宠淇℃伅");
+ }
+ if(getHasBackRoleBiz(carUseBook,loginUserInfo) == Constants.ZERO){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝鏃犳潈闄愯鎾ら攢鎿嶄綔锛�");
+ }
carUseBook.setCancelInfo(info);
carUseBook.setCancelTime(new Date());
carUseBook.setCancelStatus(Constants.ONE);
@@ -472,19 +569,77 @@
.set(Approve::getStatus,Constants.FOUR)
.set(Approve::getCheckInfo,"鐢ㄨ溅鐢宠鍙栨秷")
.in(Approve::getStatus,Constants.ZERO,Constants.ONE)
- .in(Approve::getObjType,Constants.approveObjectType.cityUseCar,Constants.approveObjectType.unCityUseCar)
+ .in(Approve::getObjType,Constants.approveObjectType.cityUseCar,Constants.approveObjectType.unCityUseCar)
.eq(Approve::getObjId,id)
);
- Member member = memberMapper.selectById(carUseBook.getMemberId());
- if(Objects.nonNull(member)&&StringUtils.isNotBlank(member.getPhone())){
+
+ //澶勭悊寰呭姙淇℃伅
+ noticesJoinMapper.update(null,new UpdateWrapper<Notices>().lambda()
+ .set(Notices::getStatus,Constants.ONE)
+ .set(Notices::getInfo,"宸插彇娑�")
+ .eq(Notices::getType,Constants.TWO)
+ .eq(Notices::getObjId,carUseBook.getId())
+ );
+
+
+ SystemUser systemUser = systemUserMapper.selectById(carUseBook.getCreator());
+ if(Objects.nonNull(systemUser)&&StringUtils.isNotBlank(systemUser.getMobile())){
//鐢ㄨ溅鐢宠鍙栨秷
SmsEmailServiceImpl.sendCarUseSms(systemDictDataBiz,
emayService,smsEmailMapper,smsConfigMapper,carUseBookMapper,carUseBook.getId(),
SmsConstants.carUseBookContent.carUseBookCancel,
- null, Arrays.asList(member.getPhone().split(","))
+ info, Arrays.asList(systemUser.getMobile().split(","))
);
+ if(StringUtils.isNotBlank(systemUser.getOpenid())){
+ carUseBook.setMemberName(systemUser.getRealname());
+ WxPlatNotice wxPlatNotice = new WxPlatNotice();
+ wxPlatNotice.sendCarUseBookTemplateNotice(systemDictDataBiz,
+ wxNoticeConfigMapper,
+ carUseBook,
+ WxPlatConstants.carUseBookContent.carUseBookCancel,
+ Arrays.asList(systemUser.getOpenid().split(",")),
+ Constants.TWO);
+ }
+
}
}
+ /**
+ * 鏌ヨ褰撳墠鐧婚檰鐢ㄦ埛鏄惁鍏锋湁閫�鍥炵敵璇风殑鏉冮檺
+ * 鐢宠浜哄彧鑳藉湪寰呭鏍镐箣鍓嶆挙閿�锛屾淳杞﹀憳鍙互鍦ㄥ緟瀹℃牳銆佸鏍镐腑銆佸鎵归�氳繃杩涜鎾ら攢
+ * @param carUseBook
+ * @param loginUserInfo
+ * @return
+ */
+ private int getHasBackRoleBiz(CarUseBook carUseBook, LoginUserInfo loginUserInfo) {
+ if(Constants.equalsInteger(carUseBook.getCreator(),loginUserInfo.getId())
+ && Constants.equalsInteger(carUseBook.getStatus(),Constants.ZERO)){
+ //鐢宠浜哄彲浠ユ挙閿�鑷繁鐢宠涓殑鐢宠璁板綍
+ return Constants.ONE;
+ }
+ if(Constants.equalsInteger(carUseBook.getStatus(),Constants.TWO)
+ && carUseBook.getStartTime()!=null
+ && System.currentTimeMillis() >= carUseBook.getStartTime().getTime()){
+ //瀹℃壒閫氳繃锛屼絾鏄� 宸插埌鍙戣溅鏃堕棿锛屼笉鍙互鎾ら攢
+ return Constants.ZERO;
+ }
+ if((Constants.equalsInteger(carUseBook.getStatus(),Constants.ZERO))
+ ||Constants.equalsInteger(carUseBook.getStatus(),Constants.ONE)
+ ||Constants.equalsInteger(carUseBook.getStatus(),Constants.TWO)){
+ //瀹℃壒浜哄彲浠ユ挙閿� 鑷繁瀹℃壒鐨勭敵璇疯褰�
+ Approve approve = approveJoinMapper.selectOne(new QueryWrapper<Approve>().lambda()
+ .eq(Approve::getIsdeleted,Constants.ZERO)
+ .ge(Approve::getLevel,Constants.ZERO)
+ .eq(Approve::getChekorId,loginUserInfo.getMemberId())
+ .eq(Approve::getObjId,carUseBook.getId())
+ .eq(Approve::getObjType,carUseBook.getType()==0?3:4)
+ .last("limit 1"));
+ if(approve!=null){
+ return Constants.ONE;
+ }
+ }
+ return Constants.ZERO;
+ }
+
}
--
Gitblit v1.9.3